diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-06-07 19:00:42 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-06-07 19:00:42 -0400 |
| commit | 13c919773e0a0e52235cae77bf15c1f3a5c22a1e (patch) | |
| tree | affd95d34c85264ef24fc6b3a991b605f0f3af26 | |
| parent | ed3a4fb8d443fc4a56419be9624631b6d42356c7 (diff) | |
| parent | df3e826d0ae3c1bc9225d057a4c7b5528269a792 (diff) | |
| download | slixmpp-13c919773e0a0e52235cae77bf15c1f3a5c22a1e.tar.gz slixmpp-13c919773e0a0e52235cae77bf15c1f3a5c22a1e.tar.bz2 slixmpp-13c919773e0a0e52235cae77bf15c1f3a5c22a1e.tar.xz slixmpp-13c919773e0a0e52235cae77bf15c1f3a5c22a1e.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0084/avatar.py | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -86,6 +86,8 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0091', 'sleekxmpp/plugins/xep_0092', + 'sleekxmpp/plugins/xep_0095', + 'sleekxmpp/plugins/xep_0096', 'sleekxmpp/plugins/xep_0107', 'sleekxmpp/plugins/xep_0108', 'sleekxmpp/plugins/xep_0115', diff --git a/sleekxmpp/plugins/xep_0084/avatar.py b/sleekxmpp/plugins/xep_0084/avatar.py index 2454afc7..677a888d 100644 --- a/sleekxmpp/plugins/xep_0084/avatar.py +++ b/sleekxmpp/plugins/xep_0084/avatar.py @@ -82,6 +82,7 @@ class XEP_0084(BasePlugin): metadata.add_pointer(pointer) return self.xmpp['xep_0163'].publish(metadata, + id=info['id'], ifrom=ifrom, block=block, callback=callback, |