cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Atheros1/PyBitmessage

Browse Source
This commit is contained in:
fuzzgun 2013-05-14 17:34:38 +01:00
commit de06cdef73
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitmessageqt/__init__.py
View File

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

4
src/pyelliptic/openssl.py
View File

@ -413,6 +413,10 @@ except:
except: except:
try: try:
OpenSSL = _OpenSSL('libcrypto.dylib') OpenSSL = _OpenSSL('libcrypto.dylib')
except:
try:
# try homebrew installation
OpenSSL = _OpenSSL('/usr/local/opt/openssl/lib/libcrypto.dylib')
except: except:
try: try:
from os import path from os import path