Ubuntu Messaging Menu #149

Merged
ghost merged 3 commits from master into master 2013-05-14 19:10:44 +02:00
Showing only changes of commit 6371b338a6 - Show all commits

View File

@ -626,6 +626,11 @@ class MyForm(QtGui.QMainWindow):
if not withMessagingMenu: if not withMessagingMenu:
return return
# if there are no items on the messaging menu then
# the subsequent query can be avoided
if not (self.mmapp.has_source("Subscriptions") or self.mmapp.has_source("Messages")):
return
shared.sqlLock.acquire() shared.sqlLock.acquire()
shared.sqlSubmitQueue.put('''SELECT toaddress, read FROM inbox WHERE msgid=?''') shared.sqlSubmitQueue.put('''SELECT toaddress, read FROM inbox WHERE msgid=?''')
shared.sqlSubmitQueue.put(inventoryHash) shared.sqlSubmitQueue.put(inventoryHash)