copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use MessageSentEvent to print to ChatControl

Browse source 
Its later than StanzaMessageOutgoingEvent, this allows encryption
Plugins to not return the encrypted payload immediatly.
For example encrypting may take some time because a password is needed
or the load has to be encrypted in another Thread.
This commit is contained in:
Philipp Hörist 2018-02-26 20:49:01 +01:00
parent 77be67f6a8
commit c6e39309cf
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gajim/chat_control.py
View file

@ -238,7 +238,7 @@ class ChatControl(ChatControlBase):
self._nec_chatstate_received) self._nec_chatstate_received)
app.ged.register_event_handler('caps-received', ged.GUI1, app.ged.register_event_handler('caps-received', ged.GUI1,
self._nec_caps_received) self._nec_caps_received)
app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE,
self._message_sent) self._message_sent)
app.ged.register_event_handler( app.ged.register_event_handler(
'mam-decrypted-message-received', 'mam-decrypted-message-received',
@ -1160,7 +1160,7 @@ class ChatControl(ChatControlBase):
self._nec_chatstate_received) self._nec_chatstate_received)
app.ged.remove_event_handler('caps-received', ged.GUI1, app.ged.remove_event_handler('caps-received', ged.GUI1,
self._nec_caps_received) self._nec_caps_received)
app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE,
self._message_sent) self._message_sent)
self.unsubscribe_events() self.unsubscribe_events()

5
gajim/common/connection.py
View file

@ -2075,10 +2075,7 @@ class Connection(CommonConnection, ConnectionHandlers):
obj.timestamp = time.time() obj.timestamp = time.time()
obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now)
app.nec.push_incoming_event(MessageSentEvent( app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj)))
None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID,
chatstate=obj.chatstate, automatic_message=obj.automatic_message,
stanza_id=obj.stanza_id, additional_data=obj.additional_data))
if isinstance(obj.jid, list): if isinstance(obj.jid, list):
for j in obj.jid: for j in obj.jid: