Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

manually merge pull requests #237

Merged
Atheros1 merged 2 commits from master into master 2013-06-20 22:42:52 +02:00
Conversation 0 Commits 2 Files Changed 3 +12 -9
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bitmessagemain.py
View File

@ -68,14 +68,17 @@ class outgoingSynSender(threading.Thread):
if shared.shutdown: if shared.shutdown:
break break
random.seed() random.seed()
shared.knownNodesLock.acquire()
HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
shared.knownNodesLock.release()
alreadyAttemptedConnectionsListLock.acquire() alreadyAttemptedConnectionsListLock.acquire()
while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList: while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList:
alreadyAttemptedConnectionsListLock.release() alreadyAttemptedConnectionsListLock.release()
# print 'choosing new sample' # print 'choosing new sample'
random.seed() random.seed()
HOST, = random.sample(shared.knownNodes[ shared.knownNodesLock.acquire()
self.streamNumber], 1) HOST, = random.sample(shared.knownNodes[self.streamNumber], 1)
shared.knownNodesLock.release()
time.sleep(1) time.sleep(1)
# Clear out the alreadyAttemptedConnectionsList every half # Clear out the alreadyAttemptedConnectionsList every half
# hour so that this program will again attempt a connection # hour so that this program will again attempt a connection

12
src/bitmessageqt/__init__.py
View File

@ -1076,8 +1076,8 @@ 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('Bitmessage', _translate( self.notifierShow('Bitmessage', unicode(_translate(
"MainWindow", "Connection lost")) "MainWindow", "Connection lost").toUtf8(),'utf-8'))
self.connected = False self.connected = False
if self.actionStatus is not None: if self.actionStatus is not None:
@ -1109,8 +1109,8 @@ class MyForm(QtGui.QMainWindow):
QIcon(":/newPrefix/images/greenicon.png")) QIcon(":/newPrefix/images/greenicon.png"))
shared.statusIconColor = 'green' shared.statusIconColor = 'green'
if not self.connected: if not self.connected:
self.notifierShow('Bitmessage', _translate( self.notifierShow('Bitmessage', unicode(_translate(
"MainWindow", "Connected")) "MainWindow", "Connected").toUtf8(),'utf-8'))
self.connected = True self.connected = True
if self.actionStatus is not None: if self.actionStatus is not None:
@ -1582,12 +1582,12 @@ class MyForm(QtGui.QMainWindow):
newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8')) newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8'))
newItem.setToolTip(unicode(fromAddress, 'utf-8')) newItem.setToolTip(unicode(fromAddress, 'utf-8'))
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'): if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
self.notifierShow('New Message', 'From ' + fromAddress) self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromAddress, 'utf-8'))
else: else:
newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8')) newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8'))
newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8'))) newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8')))
if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'): if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'):
self.notifierShow('New Message', 'From ' + fromLabel) self.notifierShow(unicode(_translate("MainWindow",'New Message').toUtf8(),'utf-8'), unicode(_translate("MainWindow",'From ').toUtf8(),'utf-8') + unicode(fromLabel, 'utf-8'))
newItem.setData(Qt.UserRole, str(fromAddress)) newItem.setData(Qt.UserRole, str(fromAddress))
newItem.setFont(font) newItem.setFont(font)
self.ui.tableWidgetInbox.setItem(0, 1, newItem) self.ui.tableWidgetInbox.setItem(0, 1, newItem)

2
src/pyelliptic/openssl.py
View File

@ -427,7 +427,7 @@ except:
lib_path = path.join(sys._MEIPASS, "libeay32.dll") lib_path = path.join(sys._MEIPASS, "libeay32.dll")
OpenSSL = _OpenSSL(lib_path) OpenSSL = _OpenSSL(lib_path)
except: except:
if 'linux' in sys.platform or 'darwin' in sys.platform: if 'linux' in sys.platform or 'darwin' in sys.platform or 'freebsd' in sys.platform:
try: try:
from ctypes.util import find_library from ctypes.util import find_library
OpenSSL = _OpenSSL(find_library('ssl')) OpenSSL = _OpenSSL(find_library('ssl'))