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_0258/security_labels.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_0258/security_labels.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0258/security_labels.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0258/security_labels.py b/sleekxmpp/plugins/xep_0258/security_labels.py index e0426f32..439143c1 100644 --- a/sleekxmpp/plugins/xep_0258/security_labels.py +++ b/sleekxmpp/plugins/xep_0258/security_labels.py @@ -25,11 +25,15 @@ class XEP_0258(BasePlugin): stanza = stanza def plugin_init(self): - self.xmpp['xep_0030'].add_feature(SecurityLabel.namespace) - register_stanza_plugin(Message, SecurityLabel) register_stanza_plugin(Iq, Catalog) + def plugin_end(self): + self.xmpp['xep_0030'].del_feature(feature=SecurityLabel.namespace) + + def session_bind(self, jid): + self.xmpp['xep_0030'].add_feature(SecurityLabel.namespace) + def get_catalog(self, jid, ifrom=None, block=True, callback=None, timeout=None): iq = self.xmpp.Iq() |