Update plugins to use session_bind handler for disco, and use plugin_end

2012-07-10 01:37:44 -07:00
parent 5df3839b7a
commit e8a3e92ceb
33 changed files with 221 additions and 26 deletions
--- 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()