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 552876e43e - Show all commits

View File

@ -2665,12 +2665,15 @@ more work your computer must do to send the message. A Time-To-Live of four or f
if self.dialog.exec_(): if self.dialog.exec_():
addressAtCurrentRow = self.getCurrentAccount() addressAtCurrentRow = self.getCurrentAccount()
acct = accountClass(addressAtCurrentRow) acct = accountClass(addressAtCurrentRow)
if isinstance(acct, GatewayAccount) and self.dialog.ui.radioButtonUnregister.isChecked(): # no chans / mailinglists
if acct.type != 'normal':
continue
if self.dialog.ui.radioButtonUnregister.isChecked():
print "unregister" print "unregister"
acct.unregister() acct.unregister()
shared.config.remove_option(addressAtCurrentRow, 'gateway') shared.config.remove_option(addressAtCurrentRow, 'gateway')
shared.writeKeysFile() shared.writeKeysFile()
elif (not isinstance(acct, GatewayAccount)) and self.dialog.ui.radioButtonRegister.isChecked(): elif self.dialog.ui.radioButtonRegister.isChecked():
print "register" print "register"
email = str(self.dialog.ui.lineEditEmail.text().toUtf8()) email = str(self.dialog.ui.lineEditEmail.text().toUtf8())
acct = MailchuckAccount(addressAtCurrentRow) acct = MailchuckAccount(addressAtCurrentRow)
@ -2680,7 +2683,8 @@ more work your computer must do to send the message. A Time-To-Live of four or f
self.getCurrentTreeWidget().currentItem().updateText() self.getCurrentTreeWidget().currentItem().updateText()
shared.writeKeysFile() shared.writeKeysFile()
else: else:
print "well nothing" pass
#print "well nothing"
# shared.writeKeysFile() # shared.writeKeysFile()
# self.rerenderInboxToLabels() # self.rerenderInboxToLabels()