Author: asterix Date: 2008-10-07 17:09:39 +0200 (Tue, 07 Oct 2008) New Revision: 10496

Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py Log: revert [10494]. see #4388

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-07 14:01:41 UTC (rev 10495) +++ trunk/src/common/connection.py 2008-10-07 15:09:39 UTC (rev 10496) @@ -945,6 +945,7 @@ self.connection = con if not self.connection: return + self.connection.set_send_timeout(self.keepalives, self.sendPing) self.connection.onreceive(None) iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id = self.connection.getAnID()

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-07 14:01:41 UTC (rev 10495) +++ trunk/src/common/connection_handlers.py 2008-10-07 15:09:39 UTC (rev 10496) @@ -2313,7 +2313,6 @@ self.discoverInfo(jid)

self.dispatch('ROSTER', roster) - self.connection.set_send_timeout(self.keepalives, self.sendPing)

def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0]