From 3841ed513a0641a9b5175023e09d9a54d1e8a08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Thu, 10 Jan 2019 21:34:17 +0100
Subject: [PATCH] DBus: Correctly raise NewMessage signal
---
gajim/remote_control.py | 8 ++++++++
gajim/session.py | 6 ------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gajim/remote_control.py b/gajim/remote_control.py
index 4882c2422c..b97830c8c8 100644
--- a/gajim/remote_control.py
+++ b/gajim/remote_control.py
@@ -312,6 +312,8 @@ class GajimRemote(Server):
ged.POSTGUI, self.on_unsubscribed_presence_received)
app.ged.register_event_handler('gc-message-received',
ged.POSTGUI, self.on_gc_message_received)
+ app.ged.register_event_handler('decrypted-message-received',
+ ged.POSTGUI, self._nec_decrypted_message_received)
app.ged.register_event_handler('our-show', ged.POSTGUI,
self.on_our_status)
app.ged.register_event_handler('account-created', ged.POSTGUI,
@@ -388,6 +390,12 @@ class GajimRemote(Server):
obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.status_code,
obj.displaymarking, obj.captcha_form, obj.needs_highlight]))
+ def _nec_decrypted_message_received(self, obj):
+ self.raise_signal('NewMessage', (
+ obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
+ obj.encrypted, obj.mtype, obj.subject,
+ obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
+
def on_our_status(self, obj):
self.raise_signal('AccountPresence', (obj.show, obj.conn.name))
diff --git a/gajim/session.py b/gajim/session.py
index 7ed573ed73..e4866a7a63 100644
--- a/gajim/session.py
+++ b/gajim/session.py
@@ -166,12 +166,6 @@ class ChatControlSession:
if not pm:
self.roster_message2(obj)
- if app.interface.remote_ctrl:
- app.interface.remote_ctrl.raise_signal('NewMessage', (
- self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
- obj.encrypted, obj.mtype, obj.subject,
- obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
-
def roster_message2(self, obj):
"""
Display the message or show notification in the roster
--
GitLab