fix #474 #478

Merged
Atheros1 merged 1 commits from master into master 2013-09-04 18:54:32 +02:00
3 changed files with 3 additions and 5 deletions
Showing only changes of commit 7ccdd14418 - Show all commits

View File

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

View File

@ -195,7 +195,6 @@ class receiveDataThread(threading.Thread):
self.sendgetdata(objectHash)
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.
print 'concerning', self.peer.host, ', len(self.objectsThatWeHaveYetToGetFromThisPeer) is', len(self.objectsThatWeHaveYetToGetFromThisPeer)
if len(self.objectsThatWeHaveYetToGetFromThisPeer) == 0:
with shared.printLock:
print '(concerning', str(self.peer) + ')', 'number of objectsThatWeHaveYetToGetFromThisPeer is now', len(self.objectsThatWeHaveYetToGetFromThisPeer)

View File

@ -139,7 +139,7 @@ class namecoinConnection (object):
assert False
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.")
# Helper routine that actually performs an JSON RPC call.