Philipp Hörist pushed to branch master at gajim / gajim
Commits:
623960be by Philipp Hörist at 2019-07-21T21:13:27Z
StartChat: Only show GroupchatInfo when not already joined
When we are already in a group chat just show the GroupChatControl
instead of GroupchatInfo
- - - - -
2 changed files:
- gajim/gtk/start_chat.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -259,7 +259,14 @@ class StartChatDialog(Gtk.ApplicationWindow):
self._show_error_page(_('You can not join a group chat '
'unless you are connected.'))
return
+
+ self.ready_to_destroy = True
+ if app.interface.show_groupchat(row.account, row.jid):
+ return
+
+ self.ready_to_destroy = False
self._disco_muc(row.account, row.jid)
+
else:
app.interface.new_chat_from_jid(row.account, row.jid)
self.ready_to_destroy = True
=====================================
gajim/gui_interface.py
=====================================
@@ -1553,6 +1553,19 @@ class Interface:
### Methods for opening new messages controls
################################################################################
+ def show_groupchat(self, account, room_jid):
+ minimized_control = self.minimized_controls[account].get(room_jid)
+ if minimized_control is not None:
+ self.roster.on_groupchat_maximized(None, room_jid, account)
+ return True
+
+ if self.msg_win_mgr.has_window(room_jid, account):
+ gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
+ # FIXME: Access message window directly
+ gc_ctrl.parent_win.set_active_tab(gc_ctrl)
+ return True
+ return False
+
def join_gc_room(self, account, room_jid, nick, password, minimize=False,
is_continued=False, config=None):
"""
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4fb0bd4
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4fb0bd4
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
