Thilo Molitor pushed to branch master at gajim / gajim

Commits:

• 55eaf70f
  by Thilo Molitor at 2016-12-16T21:53:51+01:00

  Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session
  

• c48f0419
  by Thilo Molitor at 2016-12-18T04:22:08+01:00

  Merge branch 'master' of dev.gajim.org:gajim/gajim
  

• f15497b0
  by Thilo Molitor at 2016-12-23T15:21:03+01:00

  Merge branch 'master' of dev.gajim.org:gajim/gajim
  

1 changed file:

• src/common/connection_handlers.py

Changes:

         self.name, 'request_receipt'):

             ctrl = obj.session.control

             if not ctrl:

-                # Received <message> doesn't have the <thread> element?

-                # search in all sessions

-                for s in self.get_sessions(obj.jid):

-                    if s.control:

-                        ctrl = s.control

+                # Received <message> doesn't have the <thread> element

+                # or control is not bound to session?

+                # --> search for it

+                ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid,

+                    obj.conn.name, obj.resource)

+            

             if ctrl:

                 id_ = obj.receipt_received_tag.getAttr('id')

                 if not id_: