citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Peter 2013-10-10 17:13:43 +04:00
parent 556e17779c 81123bd7ef
commit 21c012b8d6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitmessagemain.py
View File

@ -643,7 +643,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
raise APIError(0, 'I need parameters!') raise APIError(0, 'I need parameters!')
if len(params) == 1: if len(params) == 1:
address, = params address, = params
label == '' label = ''
if len(params) == 2: if len(params) == 2:
address, label = params address, label = params
label = self._decode(label, "base64") label = self._decode(label, "base64")

5
src/bitmessageqt/__init__.py
View File

@ -3284,7 +3284,10 @@ def run():
locale_lang = locale_countrycode[0:2] locale_lang = locale_countrycode[0:2]
user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale')) user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
user_lang = user_countrycode[0:2] user_lang = user_countrycode[0:2]
translation_path = "translations/bitmessage_" try:
translation_path = os.path.join(sys._MEIPASS, "translations/bitmessage_")
except Exception, e:
translation_path = "translations/bitmessage_"
if shared.config.get('bitmessagesettings', 'userlocale') == 'system': if shared.config.get('bitmessagesettings', 'userlocale') == 'system':
# try to detect the users locale otherwise fallback to English # try to detect the users locale otherwise fallback to English

2
src/class_receiveDataThread.py
View File

@ -1120,7 +1120,7 @@ class receiveDataThread(threading.Thread):
else: # We're using a whitelist else: # We're using a whitelist
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''SELECT label FROM whitelist where address=? and enabled='1' ''', '''SELECT label FROM whitelist where address=? and enabled='1' ''',
toAddress) fromAddress)
if queryreturn == []: if queryreturn == []:
print 'Message ignored because address not in whitelist.' print 'Message ignored because address not in whitelist.'
blockMessage = True blockMessage = True