Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
60b40e99
by lovetox at 2020-08-11T08:18:24+02:00
2 changed files:
Changes:
| ... | ... | @@ -1301,19 +1301,20 @@ class GroupchatControl(ChatControlBase): |
| 1301 | 1301 |
show = helpers.get_uf_show(event.properties.show.value)
|
| 1302 | 1302 |
|
| 1303 | 1303 |
status_default = app.config.get('print_status_muc_default')
|
| 1304 |
+ if not app.config.get_per('rooms', self.room_jid,
|
|
| 1305 |
+ 'print_status', status_default):
|
|
| 1306 |
+ self.roster.draw_contact(nick)
|
|
| 1307 |
+ return
|
|
| 1304 | 1308 |
|
| 1305 | 1309 |
if event.properties.is_muc_self_presence:
|
| 1306 | 1310 |
message = _('You are now {show}{status}').format(show=show,
|
| 1307 | 1311 |
status=status)
|
| 1308 |
- self.add_status_message(message)
|
|
| 1309 | 1312 |
|
| 1310 |
- elif app.config.get_per('rooms', self.room_jid,
|
|
| 1311 |
- 'print_status', status_default):
|
|
| 1313 |
+ else:
|
|
| 1312 | 1314 |
message = _('{nick} is now {show}{status}').format(nick=nick,
|
| 1313 | 1315 |
show=show,
|
| 1314 | 1316 |
status=status)
|
| 1315 |
- self.add_status_message(message)
|
|
| 1316 |
- |
|
| 1317 |
+ self.add_status_message(message)
|
|
| 1317 | 1318 |
self.roster.draw_contact(nick)
|
| 1318 | 1319 |
|
| 1319 | 1320 |
@event_filter(['account', 'room_jid'])
|
| ... | ... | @@ -128,19 +128,21 @@ class PrivateChatControl(ChatControl): |
| 128 | 128 |
show = helpers.get_uf_show(event.properties.show.value)
|
| 129 | 129 |
|
| 130 | 130 |
status_default = app.config.get('print_status_muc_default')
|
| 131 |
+ if not app.config.get_per('rooms', self.gc_contact.room_jid,
|
|
| 132 |
+ 'print_status', status_default):
|
|
| 133 |
+ self.parent_win.redraw_tab(self)
|
|
| 134 |
+ self.update_ui()
|
|
| 135 |
+ return
|
|
| 131 | 136 |
|
| 132 | 137 |
if event.properties.is_muc_self_presence:
|
| 133 | 138 |
message = _('You are now {show}{status}').format(show=show,
|
| 134 | 139 |
status=status)
|
| 135 |
- self.add_status_message(message)
|
|
| 136 | 140 |
|
| 137 |
- elif app.config.get_per('rooms', self.gc_contact.room_jid,
|
|
| 138 |
- 'print_status', status_default):
|
|
| 141 |
+ else:
|
|
| 139 | 142 |
message = _('{nick} is now {show}{status}').format(nick=nick,
|
| 140 | 143 |
show=show,
|
| 141 | 144 |
status=status)
|
| 142 |
- self.add_status_message(message)
|
|
| 143 |
- |
|
| 145 |
+ self.add_status_message(message)
|
|
| 144 | 146 |
self.parent_win.redraw_tab(self)
|
| 145 | 147 |
self.update_ui()
|
| 146 | 148 |
|