Philipp Hörist pushed to branch mainwindow at gajim / gajim
Commits: 848e20e5 by lovetox at 2021-02-05T15:27:49+01:00 Fix some events
- - - - -
4 changed files:
- gajim/chat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py
Changes:
===================================== gajim/chat_control.py ===================================== @@ -567,6 +567,9 @@ def _on_mam_message_received(self, event): additional_data=event.additional_data)
def _on_message_received(self, event): + if not event.msgtxt: + return + typ = '' if event.properties.is_sent_carbon: typ = 'out' @@ -608,16 +611,16 @@ def _on_message_sent(self, event): correct_id=event.correct_id, additional_data=event.additional_data)
- def _receipt_received(self, event): + def _on_receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id)
- def _displayed_received(self, event): + def _on_displayed_received(self, event): self.conv_textview.show_displayed(event.marker_id)
def _on_zeroconf_error(self, event): self.add_status_message(event.message)
- def _on_update_roster_avatar(self, obj): + def _on_update_roster_avatar(self, _event): self._update_avatar()
def _nec_ping(self, event):
===================================== gajim/gtk/chat_list.py ===================================== @@ -128,6 +128,9 @@ def process_event(self, event): log.warning('Unhandled Event: %s', event.name)
def _on_message_received(self, event): + if not event.msgtxt: + return + row = self._chats.get((event.account, event.jid)) if not (row.is_selected() and self.get_toplevel().get_property('has-toplevel-focus')):
===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -6,6 +6,11 @@ from gajim.gui.chat_list import ChatList
+HANDLED_EVENTS = [ + 'message-received' +] + + class ChatListStack(Gtk.Stack): def __init__(self, ui, chat_stack): Gtk.Stack.__init__(self) @@ -122,6 +127,9 @@ def contains_chat(self, account, jid, workspace_id=None): return chat_list.contains_chat(account, jid)
def process_event(self, event): + if event.name not in HANDLED_EVENTS: + return + if hasattr(event, 'jid'): jid = event.jid else:
===================================== gajim/gtk/main.py ===================================== @@ -77,6 +77,7 @@ def __init__(self): ('caps-update', ged.GUI1, self._on_event), ('message-sent', ged.OUT_POSTCORE, self._on_event), ('message-received', ged.CORE, self._on_event), + ('mam-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/848e20e56987e9b83497b2d9a218eac26...