Philipp Hörist pushed to branch master at gajim / gajim
Commits:
8b9da8f9 by lovetox at 2020-03-11T22:22:07+01:00
RemoveAccount: Fix removing disabled accounts
- - - - -
2 changed files:
- gajim/gtk/remove_account.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/gtk/remove_account.py
=====================================
@@ -149,7 +149,7 @@ class RemoveChoice(Page):
label.set_halign(Gtk.Align.CENTER)
label.set_justify(Gtk.Justification.CENTER)
- service = app.connections[account].get_own_jid().getDomain()
+ service = app.config.get_per('accounts', account, 'hostname')
check_label = Gtk.Label()
check_label.set_markup(
_('Do you want to unregister your account on <b>%s</b> as '
=====================================
gajim/gui_interface.py
=====================================
@@ -1767,7 +1767,8 @@ class Interface:
app.connections[account].disconnect(gracefully=True,
reconnect=False)
- self.disable_account(account)
+ if app.config.get_per('accounts', account, 'active'):
+ self.disable_account(account)
app.logger.remove_roster(app.get_jid_from_account(account))
# Delete password must be before del_per() because it calls set_per()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8b9da8f9ab69142848bf866254b7221dda02f42f
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/8b9da8f9ab69142848bf866254b7221dda02f42f
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
