Philipp Hörist pushed to branch mainwindow at gajim / gajim
Commits:
-
848e20e5
by lovetox at 2021-02-05T15:27:49+01:00
4 changed files:
Changes:
| ... | ... | @@ -567,6 +567,9 @@ def _on_mam_message_received(self, event): |
| 567 | 567 |
additional_data=event.additional_data)
|
| 568 | 568 |
|
| 569 | 569 |
def _on_message_received(self, event):
|
| 570 |
+ if not event.msgtxt:
|
|
| 571 |
+ return
|
|
| 572 |
+ |
|
| 570 | 573 |
typ = ''
|
| 571 | 574 |
if event.properties.is_sent_carbon:
|
| 572 | 575 |
typ = 'out'
|
| ... | ... | @@ -608,16 +611,16 @@ def _on_message_sent(self, event): |
| 608 | 611 |
correct_id=event.correct_id,
|
| 609 | 612 |
additional_data=event.additional_data)
|
| 610 | 613 |
|
| 611 |
- def _receipt_received(self, event):
|
|
| 614 |
+ def _on_receipt_received(self, event):
|
|
| 612 | 615 |
self.conv_textview.show_receipt(event.receipt_id)
|
| 613 | 616 |
|
| 614 |
- def _displayed_received(self, event):
|
|
| 617 |
+ def _on_displayed_received(self, event):
|
|
| 615 | 618 |
self.conv_textview.show_displayed(event.marker_id)
|
| 616 | 619 |
|
| 617 | 620 |
def _on_zeroconf_error(self, event):
|
| 618 | 621 |
self.add_status_message(event.message)
|
| 619 | 622 |
|
| 620 |
- def _on_update_roster_avatar(self, obj):
|
|
| 623 |
+ def _on_update_roster_avatar(self, _event):
|
|
| 621 | 624 |
self._update_avatar()
|
| 622 | 625 |
|
| 623 | 626 |
def _nec_ping(self, event):
|
| ... | ... | @@ -128,6 +128,9 @@ def process_event(self, event): |
| 128 | 128 |
log.warning('Unhandled Event: %s', event.name)
|
| 129 | 129 |
|
| 130 | 130 |
def _on_message_received(self, event):
|
| 131 |
+ if not event.msgtxt:
|
|
| 132 |
+ return
|
|
| 133 |
+ |
|
| 131 | 134 |
row = self._chats.get((event.account, event.jid))
|
| 132 | 135 |
if not (row.is_selected() and
|
| 133 | 136 |
self.get_toplevel().get_property('has-toplevel-focus')):
|
| ... | ... | @@ -6,6 +6,11 @@ |
| 6 | 6 |
from gajim.gui.chat_list import ChatList
|
| 7 | 7 |
|
| 8 | 8 |
|
| 9 |
+HANDLED_EVENTS = [
|
|
| 10 |
+ 'message-received'
|
|
| 11 |
+]
|
|
| 12 |
+ |
|
| 13 |
+ |
|
| 9 | 14 |
class ChatListStack(Gtk.Stack):
|
| 10 | 15 |
def __init__(self, ui, chat_stack):
|
| 11 | 16 |
Gtk.Stack.__init__(self)
|
| ... | ... | @@ -122,6 +127,9 @@ def contains_chat(self, account, jid, workspace_id=None): |
| 122 | 127 |
return chat_list.contains_chat(account, jid)
|
| 123 | 128 |
|
| 124 | 129 |
def process_event(self, event):
|
| 130 |
+ if event.name not in HANDLED_EVENTS:
|
|
| 131 |
+ return
|
|
| 132 |
+ |
|
| 125 | 133 |
if hasattr(event, 'jid'):
|
| 126 | 134 |
jid = event.jid
|
| 127 | 135 |
else:
|
| ... | ... | @@ -77,6 +77,7 @@ def __init__(self): |
| 77 | 77 |
('caps-update', ged.GUI1, self._on_event),
|
| 78 | 78 |
('message-sent', ged.OUT_POSTCORE, self._on_event),
|
| 79 | 79 |
('message-received', ged.CORE, self._on_event),
|
| 80 |
+ ('mam-message-received', ged.CORE, self._on_event),
|
|
| 80 | 81 |
('receipt-received', ged.GUI1, self._on_event),
|
| 81 | 82 |
('displayed-received', ged.GUI1, self._on_event),
|
| 82 | 83 |
('message-error', ged.GUI1, self._on_event),
|