Gateway register/unregister changes
- do not register/unregister channels or mailing lists - send registration/unregistration request irrespective of whether the client thinks it's registered or not. We don't know for sure it knows it correctly so don't assume that, it may confuse users
This commit is contained in:
parent
f4f2425b03
commit
0bbd853341
|
@ -2663,12 +2663,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)
|
||||||
|
@ -2678,7 +2681,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()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user