Philipp Hörist pushed to branch master at gajim / gajim
Commits: 60b40e99 by lovetox at 2020-08-11T08:18:24+02:00 MUC: Respect print status setting for own status changes
Fixes #10192
- - - - -
2 changed files:
- gajim/groupchat_control.py - gajim/privatechat_control.py
Changes:
===================================== gajim/groupchat_control.py ===================================== @@ -1301,19 +1301,20 @@ class GroupchatControl(ChatControlBase): show = helpers.get_uf_show(event.properties.show.value)
status_default = app.config.get('print_status_muc_default') + if not app.config.get_per('rooms', self.room_jid, + 'print_status', status_default): + self.roster.draw_contact(nick) + return
if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.add_status_message(message)
- elif app.config.get_per('rooms', self.room_jid, - 'print_status', status_default): + else: message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.add_status_message(message) - + self.add_status_message(message) self.roster.draw_contact(nick)
@event_filter(['account', 'room_jid'])
===================================== gajim/privatechat_control.py ===================================== @@ -128,19 +128,21 @@ class PrivateChatControl(ChatControl): show = helpers.get_uf_show(event.properties.show.value)
status_default = app.config.get('print_status_muc_default') + if not app.config.get_per('rooms', self.gc_contact.room_jid, + 'print_status', status_default): + self.parent_win.redraw_tab(self) + self.update_ui() + return
if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.add_status_message(message)
- elif app.config.get_per('rooms', self.gc_contact.room_jid, - 'print_status', status_default): + else: message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.add_status_message(message) - + self.add_status_message(message) self.parent_win.redraw_tab(self) self.update_ui()
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60b40e99a09ae376fd29283db4332c82b...