changeset a7ce6e82a6e6 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a7ce6e82a6e6 description: fix sending zeroconf messages

diffstat:

src/common/connection_handlers.py | 7 +++++-- src/common/zeroconf/connection_zeroconf.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 63d0d2393b63 -r a7ce6e82a6e6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Nov 24 22:42:33 2016 +0100 +++ b/src/common/connection_handlers.py Thu Nov 24 22:44:52 2016 +0100 @@ -898,6 +898,11 @@ # keep track of sessions this connection has with other JIDs 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 self.gpg_messages_to_decrypt = []

@@ -1458,8 +1463,6 @@ # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None - # IDs of sent messages (https://trac.gajim.org/ticket/8222) - self.sent_message_ids = []

try: self.sleeper = common.sleepy.Sleepy() diff -r 63d0d2393b63 -r a7ce6e82a6e6 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Thu Nov 24 22:42:33 2016 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Thu Nov 24 22:44:52 2016 +0100 @@ -346,7 +346,8 @@ def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, 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: obj.callback(msg_iq, *obj.callback_args)