summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0054
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-16 20:13:35 -0700
committerLance Stout <lancestout@gmail.com>2012-07-16 20:13:35 -0700
commit78f03253983779673beaf3c102ae315707a49d2c (patch)
treedd5c031b2fc96c88e3d03b7f21cb275ef937398c /sleekxmpp/plugins/xep_0054
parent1efe04995941933e7579efffd8f325d8c4b516ef (diff)
parentf6edaa56a6e91f7104cd63e5d48b39d4ca7e09f2 (diff)
downloadslixmpp-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_0054')
-rw-r--r--sleekxmpp/plugins/xep_0054/vcard_temp.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0054/vcard_temp.py b/sleekxmpp/plugins/xep_0054/vcard_temp.py
index 672f948a..83cbccf8 100644
--- a/sleekxmpp/plugins/xep_0054/vcard_temp.py
+++ b/sleekxmpp/plugins/xep_0054/vcard_temp.py
@@ -37,7 +37,6 @@ class XEP_0054(BasePlugin):
"""
register_stanza_plugin(Iq, VCardTemp)
- self.xmpp['xep_0030'].add_feature('vcard-temp')
self.api.register(self._set_vcard, 'set_vcard', default=True)
self.api.register(self._get_vcard, 'get_vcard', default=True)
@@ -50,6 +49,13 @@ class XEP_0054(BasePlugin):
StanzaPath('iq/vcard_temp'),
self._handle_get_vcard))
+ def plugin_end(self):
+ self.xmpp.remove_handler('VCardTemp')
+ self.xmpp['xep_0030'].del_feature(feature='vcard-temp')
+
+ def session_bind(self, jid):
+ self.xmpp['xep_0030'].add_feature('vcard-temp')
+
def make_vcard(self):
return VCardTemp()