Philipp Hörist pushed to branch master at gajim / gajim
Commits:
6f9c28ec by Philipp Hörist at 2019-07-26T09:24:51Z
MUC: Add a dedicated muc-joined event
- - - - -
2 changed files:
- gajim/common/modules/muc.py
- gajim/groupchat_control.py
Changes:
=====================================
gajim/common/modules/muc.py
=====================================
@@ -544,6 +544,12 @@ class MUC(BaseModule):
if muc_data.state == MUCJoinedState.JOINING:
self._remove_join_timeout(room_jid)
self._set_muc_state(room_jid, MUCJoinedState.JOINED)
+
+ app.nec.push_incoming_event(
+ NetworkEvent('muc-joined',
+ account=self._account,
+ room_jid=room_jid))
+
# We successfully joined a MUC, set autojoin bookmark
self._con.get_module('Bookmarks').add_bookmark(None,
muc_data.jid,
=====================================
gajim/groupchat_control.py
=====================================
@@ -312,6 +312,7 @@ class GroupchatControl(ChatControlBase):
settings_menu.set_menu_model(self.control_menu)
self._event_handlers = [
+ ('muc-joined', ged.GUI1, self._on_joined),
('muc-user-joined', ged.GUI1, self._on_user_joined),
('muc-user-left', ged.GUI1, self._on_user_left),
('muc-nickname-changed', ged.GUI1, self._on_nickname_changed),
@@ -1648,7 +1649,6 @@ class GroupchatControl(ChatControlBase):
# We just joined the room
self.add_info_message(_('You (%s) joined the group chat') % nick)
self.add_contact_to_roster(nick)
- self.got_connected()
if StatusCode.NON_ANONYMOUS in status_codes:
self.add_info_message(
@@ -1896,6 +1896,10 @@ class GroupchatControl(ChatControlBase):
self.remove_contact(nick)
self.draw_all_roles()
+ @event_filter(['account', 'room_jid'])
+ def _on_joined(self, _event):
+ self.got_connected()
+
@event_filter(['account', 'room_jid'])
def _on_user_joined(self, event):
nick = event.properties.muc_nickname
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a37baef4
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a37baef4
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
