copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove password before config values

This commit is contained in:
Philipp Hörist 2019-03-16 14:47:42 +01:00
parent be26f50120
commit 196d856a54
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gajim/config.py
View File

@ -190,6 +190,9 @@ class RemoveAccountWindow:
app.connections[self.account].cleanup() app.connections[self.account].cleanup()
del app.connections[self.account] del app.connections[self.account]
app.logger.remove_roster(app.get_jid_from_account(self.account)) app.logger.remove_roster(app.get_jid_from_account(self.account))
# Delete password must be before del_per() because it calls set_per()
# which would recreate the account with defaults values if not found
passwords.delete_password(self.account)
app.config.del_per('accounts', self.account) app.config.del_per('accounts', self.account)
del app.interface.instances[self.account] del app.interface.instances[self.account]
if self.account in app.nicks: if self.account in app.nicks:
@ -214,7 +217,6 @@ class RemoveAccountWindow:
app.interface.roster.setup_and_draw_roster() app.interface.roster.setup_and_draw_roster()
app.app.remove_account_actions(self.account) app.app.remove_account_actions(self.account)
gui_menu_builder.build_accounts_menu() gui_menu_builder.build_accounts_menu()
passwords.delete_password(self.account)
window = app.get_app_window('AccountsWindow') window = app.get_app_window('AccountsWindow')
if window is not None: if window is not None: