src/bitmessageqt/__init__.py

@@ -914,7 +914,7 @@ class MyForm(QtGui.QMainWindow):
             shared.statusIconColor = 'red'
             # if the connection is lost then show a notification
             if self.connected:
-                self.notifierShow('PyBitmessage','Connection lost')
+                self.notifierShow('Bitmessage','Connection lost')
             self.connected = False
 
             if self.actionStatus != None:
@@ -928,7 +928,7 @@ class MyForm(QtGui.QMainWindow):
             shared.statusIconColor = 'yellow'
             # if a new connection has been established then show a notification
             if not self.connected:
-                self.notifierShow('PyBitmessage','Connected')
+                self.notifierShow('Bitmessage','Connected')
             self.connected = True
 
             if self.actionStatus != None:
@@ -939,6 +939,8 @@ class MyForm(QtGui.QMainWindow):
                 self.statusBar().showMessage('')
             self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/greenicon.png"))
             shared.statusIconColor = 'green'
+            if not self.connected:
+                self.notifierShow('Bitmessage','Connected')
             self.connected = True
 
             if self.actionStatus != None:

src/pyelliptic/openssl.py

@@ -415,17 +415,21 @@ except:
             OpenSSL = _OpenSSL('libcrypto.dylib')
         except:
             try:
-                from os import path
-                lib_path = path.join(sys._MEIPASS, "libeay32.dll")
-                OpenSSL = _OpenSSL(lib_path)
+                # try homebrew installation
+                OpenSSL = _OpenSSL('/usr/local/opt/openssl/lib/libcrypto.dylib')
             except:
-                if 'linux' in sys.platform or 'darwin' in sys.platform:
-                    try:
-                        from ctypes.util import find_library
-                        OpenSSL = _OpenSSL(find_library('ssl'))
-                    except Exception, err:
-                        sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n')
-                        from ctypes.util import find_library
-                        OpenSSL = _OpenSSL(find_library('ssl'))
-                else:
-                    raise Exception("Couldn't find and load the OpenSSL library. You must install it.")
+                try:
+                    from os import path
+                    lib_path = path.join(sys._MEIPASS, "libeay32.dll")
+                    OpenSSL = _OpenSSL(lib_path)
+                except:
+                    if 'linux' in sys.platform or 'darwin' in sys.platform:
+                        try:
+                            from ctypes.util import find_library
+                            OpenSSL = _OpenSSL(find_library('ssl'))
+                        except Exception, err:
+                            sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n')
+                            from ctypes.util import find_library
+                            OpenSSL = _OpenSSL(find_library('ssl'))
+                    else:
+                        raise Exception("Couldn't find and load the OpenSSL library. You must install it.")