V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 8909a535ae - Show all commits

View File

@ -3174,10 +3174,8 @@ class MyForm(settingsmixin.SMainWindow):
inventoryHashToTrash = str(tableWidget.item( inventoryHashToTrash = str(tableWidget.item(
currentRow, 3).data(Qt.UserRole).toPyObject()) currentRow, 3).data(Qt.UserRole).toPyObject())
if folder == "trash" or shifted: if folder == "trash" or shifted:
logger.debug ("deleting")
sqlExecute('''DELETE FROM inbox WHERE msgid=?''', inventoryHashToTrash) sqlExecute('''DELETE FROM inbox WHERE msgid=?''', inventoryHashToTrash)
else: else:
logger.debug ("moving to trash, because folder = \"%s\" and shifted = %r %x", folder, shifted)
sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', inventoryHashToTrash) sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', inventoryHashToTrash)
if tableWidget.item(currentRow, 0).font().bold(): if tableWidget.item(currentRow, 0).font().bold():
unread = True unread = True