Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
36805577
by Philipp Hörist at 2019-08-06T20:32:11Z
-
6b789e16
by Philipp Hörist at 2019-08-07T16:11:25Z
2 changed files:
Changes:
| ... | ... | @@ -123,7 +123,7 @@ class MAM(BaseModule): |
| 123 | 123 |
|
| 124 | 124 |
else:
|
| 125 | 125 |
archive_jid = self._con.get_own_jid().getBare()
|
| 126 |
- namespace = self._con.get_module('MAM').archiving_namespace
|
|
| 126 |
+ namespace = self.archiving_namespace
|
|
| 127 | 127 |
timestamp = None
|
| 128 | 128 |
|
| 129 | 129 |
if properties.stanza_id is None or namespace != nbxmpp.NS_MAM_2:
|
| ... | ... | @@ -132,8 +132,7 @@ class MAM(BaseModule): |
| 132 | 132 |
if not archive_jid == properties.stanza_id.by:
|
| 133 | 133 |
return
|
| 134 | 134 |
|
| 135 |
- if not self._con.get_module('MAM').is_catch_up_finished(
|
|
| 136 |
- archive_jid):
|
|
| 135 |
+ if not self.is_catch_up_finished(archive_jid):
|
|
| 137 | 136 |
return
|
| 138 | 137 |
|
| 139 | 138 |
app.logger.set_archive_infos(archive_jid,
|
| ... | ... | @@ -1496,6 +1496,9 @@ class GroupchatControl(ChatControlBase): |
| 1496 | 1496 |
if self.parent_win:
|
| 1497 | 1497 |
self.parent_win.redraw_tab(self)
|
| 1498 | 1498 |
|
| 1499 |
+ # Update Roster
|
|
| 1500 |
+ app.interface.roster.draw_contact(self.room_jid, self.account)
|
|
| 1501 |
+ |
|
| 1499 | 1502 |
formattings_button = self.xml.get_object('formattings_button')
|
| 1500 | 1503 |
formattings_button.set_sensitive(True)
|
| 1501 | 1504 |
|
| ... | ... | @@ -1524,10 +1527,8 @@ class GroupchatControl(ChatControlBase): |
| 1524 | 1527 |
con = app.connections[self.account]
|
| 1525 | 1528 |
con.get_module('Chatstate').remove_delay_timeout(self.contact)
|
| 1526 | 1529 |
|
| 1527 |
- contact = app.contacts.get_groupchat_contact(self.account,
|
|
| 1528 |
- self.room_jid)
|
|
| 1529 |
- if contact is not None:
|
|
| 1530 |
- app.interface.roster.draw_contact(self.room_jid, self.account)
|
|
| 1530 |
+ # Update Roster
|
|
| 1531 |
+ app.interface.roster.draw_contact(self.room_jid, self.account)
|
|
| 1531 | 1532 |
|
| 1532 | 1533 |
# We don't redraw the whole banner here, because only icon change
|
| 1533 | 1534 |
self._update_banner_state_image()
|