Philipp Hörist pushed to branch master at gajim / gajim

Commits:

• b8fe0e20
  by Apromixately at 2017-12-16T16:23:44+01:00

  Remove incorrect assert
  
  When a ping reply is received there is probably a connection. Anyway, the
  last ping might have been lost and the ids might not match up.
  

• 0959bd44
  by Philipp Hörist at 2017-12-17T18:01:44+01:00

  Merge branch 'master' into 'master'
  
  Remove incorrect assert
  
  See merge request gajim/gajim!171

1 changed file:

• gajim/common/connection.py

Changes:

             self.connection.send(' ')

     def _on_xmpp_ping_answer(self, iq_obj):

-        id_ = iq_obj.getAttr('id')

-        assert id_ == self.awaiting_xmpp_ping_id

         self.awaiting_xmpp_ping_id = None

     def sendPing(self, pingTo=None, control=None):