Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
b84054b5
by Philipp Hörist at 2019-01-10T20:34:17Z
2 changed files:
Changes:
| ... | ... | @@ -312,6 +312,8 @@ class GajimRemote(Server): |
| 312 | 312 |
ged.POSTGUI, self.on_unsubscribed_presence_received)
|
| 313 | 313 |
app.ged.register_event_handler('gc-message-received',
|
| 314 | 314 |
ged.POSTGUI, self.on_gc_message_received)
|
| 315 |
+ app.ged.register_event_handler('decrypted-message-received',
|
|
| 316 |
+ ged.POSTGUI, self._nec_decrypted_message_received)
|
|
| 315 | 317 |
app.ged.register_event_handler('our-show', ged.POSTGUI,
|
| 316 | 318 |
self.on_our_status)
|
| 317 | 319 |
app.ged.register_event_handler('account-created', ged.POSTGUI,
|
| ... | ... | @@ -387,6 +389,12 @@ class GajimRemote(Server): |
| 387 | 389 |
obj.timestamp, obj.delayed, obj.xhtml_msgtxt,
|
| 388 | 390 |
obj.displaymarking, obj.needs_highlight]))
|
| 389 | 391 |
|
| 392 |
+ def _nec_decrypted_message_received(self, obj):
|
|
| 393 |
+ self.raise_signal('NewMessage', (
|
|
| 394 |
+ obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
|
|
| 395 |
+ obj.encrypted, obj.mtype, obj.subject,
|
|
| 396 |
+ obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
|
|
| 397 |
+ |
|
| 390 | 398 |
def on_our_status(self, obj):
|
| 391 | 399 |
self.raise_signal('AccountPresence', (obj.show, obj.conn.name))
|
| 392 | 400 |
|
| ... | ... | @@ -168,12 +168,6 @@ class ChatControlSession: |
| 168 | 168 |
if not pm:
|
| 169 | 169 |
self.roster_message2(obj)
|
| 170 | 170 |
|
| 171 |
- if app.interface.remote_ctrl:
|
|
| 172 |
- app.interface.remote_ctrl.raise_signal('NewMessage', (
|
|
| 173 |
- self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
|
|
| 174 |
- obj.encrypted, obj.mtype, obj.subject,
|
|
| 175 |
- obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
|
|
| 176 |
- |
|
| 177 | 171 |
def roster_message2(self, obj):
|
| 178 | 172 |
"""
|
| 179 | 173 |
Display the message or show notification in the roster
|