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 b8baceb629 - Show all commits

View File

@ -587,6 +587,8 @@ class MyForm(QtGui.QMainWindow):
self.timer.start(2000) # milliseconds self.timer.start(2000) # milliseconds
QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.runEveryTwoSeconds) QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.runEveryTwoSeconds)
self.recurDepth = 0
self.init_file_menu() self.init_file_menu()
self.init_inbox_popup_menu() self.init_inbox_popup_menu()
self.init_identities_popup_menu() self.init_identities_popup_menu()
@ -595,7 +597,7 @@ class MyForm(QtGui.QMainWindow):
self.init_chan_popup_menu() self.init_chan_popup_menu()
self.init_sent_popup_menu() self.init_sent_popup_menu()
self.init_blacklist_popup_menu() self.init_blacklist_popup_menu()
# Initialize the user's list of addresses on the 'Chan' tab. # Initialize the user's list of addresses on the 'Chan' tab.
self.rerenderTabTreeChans() self.rerenderTabTreeChans()
@ -3488,10 +3490,16 @@ more work your computer must do to send the message. A Time-To-Live of four or f
# unchanged, do not do anything either # unchanged, do not do anything either
if newLabel == oldLabel: if newLabel == oldLabel:
return return
# recursion prevention
if self.recurDepth > 0:
return
self.recurDepth += 1
shared.config.set(str(item.address), 'label', newLabel) shared.config.set(str(item.address), 'label', newLabel)
item.updateText() item.updateText()
shared.writeKeysFile() shared.writeKeysFile()
self.recurDepth -= 1
def tableWidgetInboxItemClicked(self): def tableWidgetInboxItemClicked(self):
folder = self.getCurrentFolder() folder = self.getCurrentFolder()