Philipp Hörist pushed to branch mainwindow at gajim / gajim
Commits: 615eb3f4 by lovetox at 2021-02-05T16:59:16+01:00 Fix more events
- - - - -
5 changed files:
- gajim/common/modules/mam.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/history_sync.py - gajim/gtk/main.py
Changes:
===================================== gajim/common/modules/mam.py ===================================== @@ -161,7 +161,7 @@ def _mam_message_received(self, _con, stanza, properties): return
app.nec.push_incoming_event( - NetworkIncomingEvent('mam-message-received', + NetworkIncomingEvent('raw-mam-message-received', account=self._account, stanza=stanza, properties=properties)) @@ -245,7 +245,7 @@ def _mam_message_received(self, _con, stanza, properties): message_id=properties.id)
app.nec.push_incoming_event( - NetworkEvent('mam-decrypted-message-received', + NetworkEvent('mam-message-received', account=self._account, additional_data=additional_data, correct_id=parse_correction(properties), @@ -253,6 +253,7 @@ def _mam_message_received(self, _con, stanza, properties): msgtxt=properties.body, properties=properties, kind=kind, + jid=str(properties.jid.bare) ) )
===================================== gajim/gtk/chat_list.py ===================================== @@ -124,7 +124,9 @@ def update_time(self): row.update_time()
def process_event(self, event): - if event.name == 'message-received': + if event.name in ('message-received', + 'mam-message-received', + 'gc-message-received'): self._on_message_received(event) else: log.warning('Unhandled Event: %s', event.name)
===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -7,7 +7,9 @@
HANDLED_EVENTS = [ - 'message-received' + 'message-received', + 'mam-message-received', + 'gc-message-received', ]
===================================== gajim/gtk/history_sync.py ===================================== @@ -95,7 +95,7 @@ def __init__(self, account, parent): self.register_events([ ('archiving-count-received', ged.GUI1, self._received_count), ('archiving-interval-finished', ged.GUI1, self._received_finished), - ('mam-message-received', ged.PRECORE, self._nec_mam_message_received), + ('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received), ]) # pylint: enable=line-too-long
===================================== gajim/gtk/main.py ===================================== @@ -78,6 +78,7 @@ def __init__(self): ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-received', ged.CORE, self._on_event), ('mam-message-received', ged.CORE, self._on_event), + ('gc-message-received', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event),
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/615eb3f4f5be0784b58e43fe1bcd2b2c3...