diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-16 20:13:35 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-16 20:13:35 -0700 |
| commit | 78f03253983779673beaf3c102ae315707a49d2c (patch) | |
| tree | dd5c031b2fc96c88e3d03b7f21cb275ef937398c /sleekxmpp/plugins/xep_0199/ping.py | |
| parent | 1efe04995941933e7579efffd8f325d8c4b516ef (diff) | |
| parent | f6edaa56a6e91f7104cd63e5d48b39d4ca7e09f2 (diff) | |
| download | slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.gz slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.bz2 slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.xz slixmpp-78f03253983779673beaf3c102ae315707a49d2c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0199/ping.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0199/ping.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0199/ping.py b/sleekxmpp/plugins/xep_0199/ping.py index 851e5ae5..b9d145aa 100644 --- a/sleekxmpp/plugins/xep_0199/ping.py +++ b/sleekxmpp/plugins/xep_0199/ping.py @@ -74,6 +74,16 @@ class XEP_0199(BasePlugin): self.xmpp.add_event_handler('session_end', self._handle_session_end) + def plugin_end(self): + self.xmpp['xep_0030'].del_feature(feature=Ping.namespace) + self.xmpp.remove_handler('Ping') + if self.keepalive: + self.xmpp.del_event_handler('session_start', + self._handle_keepalive) + self.xmpp.del_event_handler('session_end', + self._handle_session_end) + + def session_bind(self, jid): self.xmpp['xep_0030'].add_feature(Ping.namespace) def _handle_keepalive(self, event): |