[Git][gajim/gajim][master] Use open JoinGroupchat Dialog when browsing MUCs
Philipp Hörist
gitlab at dev.gajim.org
Fri Jul 6 21:44:35 CEST 2018
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
63a27ace by Philipp Hörist at 2018-07-06T21:43:53+02:00
Use open JoinGroupchat Dialog when browsing MUCs
- - - - -
2 changed files:
- gajim/common/app.py
- gajim/disco.py
Changes:
=====================================
gajim/common/app.py
=====================================
--- a/gajim/common/app.py
+++ b/gajim/common/app.py
@@ -583,6 +583,9 @@ def prefers_app_menu():
def get_app_window(cls):
for win in app.get_windows():
- if isinstance(win, cls):
+ if isinstance(cls, str):
+ if type(win).__name__ == cls:
+ return win
+ elif isinstance(win, cls):
return win
return None
=====================================
gajim/disco.py
=====================================
--- a/gajim/disco.py
+++ b/gajim/disco.py
@@ -1797,11 +1797,12 @@ class MucBrowser(AgentBrowser):
if not iter_:
return
service = model[iter_][0]
- if 'join_gc' not in app.interface.instances[self.account]:
+ window = app.get_app_window('JoinGroupchatWindow')
+ if window is None:
app.interface.join_gc_minimal(self.account, service)
else:
- app.interface.instances[self.account]['join_gc'].set_room(service)
- app.interface.instances[self.account]['join_gc'].present()
+ window.set_room(service)
+ window.present()
self.window.destroy()
def update_actions(self):
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63a27ace61848047ea345790f6bdcce3db34d9ca
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63a27ace61848047ea345790f6bdcce3db34d9ca
You're receiving this email because of your account on dev.gajim.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gajim.org/pipermail/commits/attachments/20180706/30f3d486/attachment-0001.html>
More information about the Commits
mailing list