Merge remote-tracking branch 'upstream/master'

src/bitmessagemain.py

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

src/bitmessageqt/__init__.py

@@ -3284,7 +3284,10 @@ def run():
     locale_lang = locale_countrycode[0:2]
     user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
     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':
         # try to detect the users locale otherwise fallback to English

src/class_receiveDataThread.py

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