Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits: f62b8bfe by wurstsalat at 2021-10-31T20:58:02+01:00 AV: Fix notification

- - - - -

3 changed files:

- gajim/gtk/call_widget.py - gajim/gtk/notification.py - gajim/gui_interface.py

Changes:

===================================== gajim/gtk/call_widget.py ===================================== @@ -206,16 +206,13 @@ def _on_jingle_request(self, event): # There is no voice call running running yet self.emit('incoming-call', event)

- contact = self._client.get_module('Contacts').get_contact( - event.jid) - app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, - notif_type='jingle-incoming', + account=self._account, + jid=self._contact.jid, + notif_type='incoming-call', title=_('Incoming Call'), - text=_('%s is calling') % contact.name)) + text=_('%s is calling') % self._contact.name))

def _on_jingle_connected(self, event): session = self._client.get_module('Jingle').get_jingle_session(

===================================== gajim/gtk/notification.py ===================================== @@ -52,7 +52,7 @@ NOTIFICATION_ICONS = { 'incoming-message': 'gajim-chat_msg_recv', 'group-chat-invitation': 'gajim-gc_invitation', - 'jingle-incoming': 'call-start-symbolic', + 'incoming-call': 'call-start-symbolic', 'subscription_request': 'gajim-subscription_request', 'unsubscribed': 'gajim-unsubscribed', 'file-request-received': 'document-send',

===================================== gajim/gui_interface.py ===================================== @@ -234,7 +234,7 @@ def handle_event(self, account, jid, notif_detail): app.window.select_chat(account, jid) elif notif_detail in ('chat-message', 'group-chat-message'): app.window.select_chat(account, jid.bare) - elif notif_detail == 'jingle-incoming': + elif notif_detail == 'incoming-call': app.window.select_chat(account, jid.bare) elif notif_detail == 'file-request-received': app.window.select_chat(account, jid.bare)

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f62b8bfe546763db48b279d69634d9960...