summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
committerLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
commitf89df6e70cee5840dbdbf41e68ae7d2384814373 (patch)
treedff0d3315c117ecba12fdc2837dd3ed6fad01b86 /sleekxmpp/xmlstream
parent250d28e870b63576e09dd1288b05394808518369 (diff)
parent0e36a0135407ea9a274517c7cfd5fe32eda0491f (diff)
downloadslixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.gz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.bz2
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.xz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 6dfd5498..c0d02e9b 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -317,7 +317,7 @@ class XMLStream(object):
self.dns_service = None
self.add_event_handler('connected', self._handle_connected)
- self.add_event_handler('disconnected', self._end_keepalive)
+ self.add_event_handler('disconnected', self._remove_schedules)
self.add_event_handler('session_start', self._start_keepalive)
self.add_event_handler('session_start', self._cert_expiration)
@@ -878,9 +878,10 @@ class XMLStream(object):
kwargs = {'now': True},
repeat=True)
- def _end_keepalive(self, event):
- """Stop sending whitespace keepalives"""
+ def _remove_schedules(self, event):
+ """Remove whitespace keepalive and certificate expiration schedules."""
self.scheduler.remove('Whitespace Keepalive')
+ self.scheduler.remove('Certificate Expiration')
def start_stream_handler(self, xml):
"""Perform any initialization actions, such as handshakes,