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_0084 | |
| 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_0084')
| -rw-r--r-- | sleekxmpp/plugins/xep_0084/avatar.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0084/avatar.py b/sleekxmpp/plugins/xep_0084/avatar.py index 14ab7d97..bbac330a 100644 --- a/sleekxmpp/plugins/xep_0084/avatar.py +++ b/sleekxmpp/plugins/xep_0084/avatar.py @@ -28,14 +28,19 @@ class XEP_0084(BasePlugin): stanza = stanza def plugin_init(self): - self.xmpp['xep_0163'].register_pep('avatar_metadata', MetaData) - pubsub_stanza = self.xmpp['xep_0060'].stanza register_stanza_plugin(pubsub_stanza.Item, Data) register_stanza_plugin(pubsub_stanza.EventItem, Data) self.xmpp['xep_0060'].map_node_event(Data.namespace, 'avatar_data') + def plugin_end(self): + self.xmpp['xep_0030'].del_feature(feature=MetaData.namespace) + self.xmpp['xep_0163'].remove_interest(MetaData.namespace) + + def session_bind(self, jid): + self.xmpp['xep_0163'].register_pep('avatar_metadata', MetaData) + def retrieve_avatar(self, jid, id, url=None, ifrom=None, block=True, callback=None, timeout=None): return self.xmpp['xep_0060'].get_item(jid, Data.namespace, id, |