diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-02-25 09:53:35 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-02-25 09:53:35 -0800 |
| commit | 82bbe5d1a67613d5e1a23bec4260b9e6644d339b (patch) | |
| tree | 2d7a61c4f64afc7485e5a6ae71b0fe972ab8d1e4 /sleekxmpp/plugins/xep_0045.py | |
| parent | 9a45ebd98bb03120f1eca3945eaa8777abe8ece0 (diff) | |
| parent | a1d71d31e85df2cf6efc835c30592126ca9861f2 (diff) | |
| download | slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.gz slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.bz2 slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.xz slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.zip | |
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/plugins/xep_0045.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0045.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py index b823e76d..1d5f3c83 100644 --- a/sleekxmpp/plugins/xep_0045.py +++ b/sleekxmpp/plugins/xep_0045.py @@ -125,11 +125,11 @@ class XEP_0045(BasePlugin): self.xep = '0045' # load MUC support in presence stanzas register_stanza_plugin(Presence, MUCPresence) - self.xmpp.registerHandler(Callback('MUCPresence', MatchXMLMask("<presence xmlns='%s' />" % self.xmpp.default_ns), self.handle_groupchat_presence)) - self.xmpp.registerHandler(Callback('MUCMessage', MatchXMLMask("<message xmlns='%s' type='groupchat'><body/></message>" % self.xmpp.default_ns), self.handle_groupchat_message)) - self.xmpp.registerHandler(Callback('MUCSubject', MatchXMLMask("<message xmlns='%s' type='groupchat'><subject/></message>" % self.xmpp.default_ns), self.handle_groupchat_subject)) - self.xmpp.registerHandler(Callback('MUCConfig', MatchXMLMask("<message xmlns='%s' type='groupchat'><x xmlns='http://jabber.org/protocol/muc#user'><status/></x></message>" % self.xmpp.default_ns), self.handle_config_change)) - self.xmpp.registerHandler(Callback('MUCInvite', MatchXPath("{%s}message/{%s}x/{%s}invite" % ( + self.xmpp.register_handler(Callback('MUCPresence', MatchXMLMask("<presence xmlns='%s' />" % self.xmpp.default_ns), self.handle_groupchat_presence)) + self.xmpp.register_handler(Callback('MUCMessage', MatchXMLMask("<message xmlns='%s' type='groupchat'><body/></message>" % self.xmpp.default_ns), self.handle_groupchat_message)) + self.xmpp.register_handler(Callback('MUCSubject', MatchXMLMask("<message xmlns='%s' type='groupchat'><subject/></message>" % self.xmpp.default_ns), self.handle_groupchat_subject)) + self.xmpp.register_handler(Callback('MUCConfig', MatchXMLMask("<message xmlns='%s' type='groupchat'><x xmlns='http://jabber.org/protocol/muc#user'><status/></x></message>" % self.xmpp.default_ns), self.handle_config_change)) + self.xmpp.register_handler(Callback('MUCInvite', MatchXPath("{%s}message/{%s}x/{%s}invite" % ( self.xmpp.default_ns, 'http://jabber.org/protocol/muc#user', 'http://jabber.org/protocol/muc#user')), self.handle_groupchat_invite)) |