pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

Browse source
This commit is contained in:
Lance Stout 2013-06-07 19:00:42 -04:00
commit 13c919773e
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -86,6 +86,8 @@ packages = [ 'sleekxmpp',
'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0086',
'sleekxmpp/plugins/xep_0091', 'sleekxmpp/plugins/xep_0091',
'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0092',
'sleekxmpp/plugins/xep_0095',
'sleekxmpp/plugins/xep_0096',
'sleekxmpp/plugins/xep_0107', 'sleekxmpp/plugins/xep_0107',
'sleekxmpp/plugins/xep_0108', 'sleekxmpp/plugins/xep_0108',
'sleekxmpp/plugins/xep_0115', 'sleekxmpp/plugins/xep_0115',

1
sleekxmpp/plugins/xep_0084/avatar.py
View file

@ -82,6 +82,7 @@ class XEP_0084(BasePlugin):
metadata.add_pointer(pointer) metadata.add_pointer(pointer)
return self.xmpp['xep_0163'].publish(metadata, return self.xmpp['xep_0163'].publish(metadata,
id=info['id'],
ifrom=ifrom, ifrom=ifrom,
block=block, block=block,
callback=callback, callback=callback,