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

fix sending zeroconf messages

Browse source
This commit is contained in:
Yann Leboulanger 2016-11-24 22:44:52 +01:00
parent 25fb8c9a3a
commit 6fbb4ce6cb
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/connection_handlers.py
View file

@ -882,6 +882,11 @@ class ConnectionHandlersBase:
# keep track of sessions this connection has with other JIDs # keep track of sessions this connection has with other JIDs
self.sessions = {} self.sessions = {}
# IDs of sent messages (https://trac.gajim.org/ticket/8222)
self.sent_message_ids = []
self.received_message_hashes = []
# We decrypt GPG messages one after the other. Keep queue in mem # We decrypt GPG messages one after the other. Keep queue in mem
self.gpg_messages_to_decrypt = [] self.gpg_messages_to_decrypt = []
@ -1442,8 +1447,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream):
# ID of urn:xmpp:ping requests # ID of urn:xmpp:ping requests
self.awaiting_xmpp_ping_id = None self.awaiting_xmpp_ping_id = None
self.continue_connect_info = None self.continue_connect_info = None
# IDs of sent messages (https://trac.gajim.org/ticket/8222)
self.sent_message_ids = []
try: try:
self.sleeper = common.sleepy.Sleepy() self.sleeper = common.sleepy.Sleepy()

3
src/common/zeroconf/connection_zeroconf.py
View file

@ -343,7 +343,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
def on_send_ok(msg_id): def on_send_ok(msg_id):
gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
jid=obj.jid, message=obj.message, keyID=obj.keyID, jid=obj.jid, message=obj.message, keyID=obj.keyID,
chatstate=None)) automatic_message=obj.automatic_message, chatstate=None,
msg_id=msg_id))
if obj.callback: if obj.callback:
obj.callback(msg_iq, *obj.callback_args) obj.callback(msg_iq, *obj.callback_args)