From 2a242bf3bdc5252844f6cbdd12238891b3320d1d Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Thu, 22 Mar 2012 20:49:38 +0100
Subject: [PATCH] revert 515744029d22, there is no timeout for <r> requests, so
 we never check if we have the result. see #7090

---
 src/common/connection.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/common/connection.py b/src/common/connection.py
index ff8556417..418c1694e 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1616,8 +1616,7 @@ class Connection(CommonConnection, ConnectionHandlers):
         if not gajim.account_is_connected(self.name):
             return
         self.connection.set_send_timeout(self.keepalives, self.send_keepalive)
-        self.connection.set_send_timeout2(self.pingalives,
-        	self.sm.enabled and self.sm.request_ack or self.sendPing)
+        self.connection.set_send_timeout2(self.pingalives, self.sendPing)
         self.connection.onreceive(None)
 
         self.privacy_rules_requested = False