summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0199
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
committerLance Stout <lancestout@gmail.com>2011-03-18 15:51:44 -0400
commitf2c99798a6cf0dafe10fd547b036ecbb7a32569b (patch)
tree8a5d8192e3e0ed06cdb124a15daad5039a62e479 /sleekxmpp/plugins/xep_0199
parentd5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (diff)
parent996ca52471931ccb3ac5a0f661e52fdc400db64b (diff)
downloadslixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.gz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.bz2
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.tar.xz
slixmpp-f2c99798a6cf0dafe10fd547b036ecbb7a32569b.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0199')
-rw-r--r--sleekxmpp/plugins/xep_0199/ping.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0199/ping.py b/sleekxmpp/plugins/xep_0199/ping.py
index 064af4ca..d1e08e61 100644
--- a/sleekxmpp/plugins/xep_0199/ping.py
+++ b/sleekxmpp/plugins/xep_0199/ping.py
@@ -54,7 +54,7 @@ class xep_0199(base_plugin):
self.xep = '0199'
self.stanza = stanza
- self.keepalive = self.config.get('keepalive', True)
+ self.keepalive = self.config.get('keepalive', False)
self.frequency = float(self.config.get('frequency', 300))
self.timeout = self.config.get('timeout', 30)
@@ -90,7 +90,7 @@ class xep_0199(base_plugin):
"""Send ping request to the server."""
log.debug("Pinging...")
resp = self.send_ping(self.xmpp.boundjid.host, self.timeout)
- if not resp:
+ if resp is None or resp is False:
log.debug("Did not recieve ping back in time." + \
"Requesting Reconnect.")
self.xmpp.reconnect()
@@ -160,4 +160,4 @@ class xep_0199(base_plugin):
# Backwards compatibility for names
-Ping.sendPing = Ping.send_ping
+xep_0199.sendPing = xep_0199.send_ping