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

fix #474 #478

Merged
Atheros1 merged 1 commits from master into master 2013-09-04 18:54:32 +02:00
Conversation 0 Commits 1 Files Changed 3 +3 -5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ccdd14418 - Show all commits

5
src/bitmessageqt/__init__.py
View File

@ -2718,9 +2718,8 @@ class MyForm(QtGui.QMainWindow):
inventoryHash = str(self.ui.tableWidgetInbox.item( inventoryHash = str(self.ui.tableWidgetInbox.item(
currentRow, 3).data(Qt.UserRole).toPyObject()) currentRow, 3).data(Qt.UserRole).toPyObject())
t = (inventoryHash,) self.ubuntuMessagingMenuClear(inventoryHash)
self.ubuntuMessagingMenuClear(t) sqlExecute('''update inbox set read=1 WHERE msgid=?''', inventoryHash)
sqlExecute('''update inbox set read=1 WHERE msgid=?''', *t)
def tableWidgetSentItemClicked(self): def tableWidgetSentItemClicked(self):
currentRow = self.ui.tableWidgetSent.currentRow() currentRow = self.ui.tableWidgetSent.currentRow()

1
src/class_receiveDataThread.py
View File

@ -195,7 +195,6 @@ class receiveDataThread(threading.Thread):
self.sendgetdata(objectHash) self.sendgetdata(objectHash)
del self.objectsThatWeHaveYetToGetFromThisPeer[ del self.objectsThatWeHaveYetToGetFromThisPeer[
objectHash] # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway. objectHash] # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway.
print 'concerning', self.peer.host, ', len(self.objectsThatWeHaveYetToGetFromThisPeer) is', len(self.objectsThatWeHaveYetToGetFromThisPeer)
if len(self.objectsThatWeHaveYetToGetFromThisPeer) == 0: if len(self.objectsThatWeHaveYetToGetFromThisPeer) == 0:
with shared.printLock: with shared.printLock:
print '(concerning', str(self.peer) + ')', 'number of objectsThatWeHaveYetToGetFromThisPeer is now', len(self.objectsThatWeHaveYetToGetFromThisPeer) print '(concerning', str(self.peer) + ')', 'number of objectsThatWeHaveYetToGetFromThisPeer is now', len(self.objectsThatWeHaveYetToGetFromThisPeer)

2
src/namecoin.py
View File

@ -139,7 +139,7 @@ class namecoinConnection (object):
assert False assert False
except Exception as exc: except Exception as exc:
print "Exception testing the namecoin connection:\n%s" % str (exc) print "Namecoin connection test: %s" % str (exc)
return ('failed', "The connection to namecoin failed.") return ('failed', "The connection to namecoin failed.")
# Helper routine that actually performs an JSON RPC call. # Helper routine that actually performs an JSON RPC call.