Philipp Hörist pushed to branch master at gajim / gajim

Commits: 29b5abc7 by lovetox at 2020-03-29T09:11:11+02:00 Interface: Close all account related windows on disable

- - - - -

2 changed files:

- gajim/gtk/util.py - gajim/gui_interface.py

Changes:

===================================== gajim/gtk/util.py ===================================== @@ -700,6 +700,15 @@ def make_href_markup(string): return URL_REGEX.sub(_to_href, string)

+def get_app_windows(account): + windows = [] + for win in app.app.get_windows(): + if hasattr(win, 'account'): + if win.account == account: + windows.append(win) + return windows + + def get_app_window(name, account=None, jid=None): for win in app.app.get_windows(): if type(win).__name__ != name:

===================================== gajim/gui_interface.py ===================================== @@ -105,6 +105,7 @@ from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import open_window from gajim.gtk.util import get_app_window +from gajim.gtk.util import get_app_windows from gajim.gtk.const import ControlType

@@ -1751,6 +1752,11 @@ class Interface: for jid in self.minimized_controls[account]: ctrl = self.minimized_controls[account][jid] ctrl.shutdown() + + for win in get_app_windows(account): + # Close all account specific windows + win.destroy() + if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup()

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/29b5abc70e12055c1da3962ea830665a3...