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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Lance Stout 2012-07-26 12:24:34 -07:00
commit c9b2cf6043
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/componentxmpp.py
View file

@ -158,7 +158,7 @@ class ComponentXMPP(BaseXMPP):
"""
self.session_bind_event.set()
self.session_started_event.set()
self.event("session_bind", self.xmpp.boundjid, direct=True)
self.event("session_bind", self.boundjid, direct=True)
self.event("session_start")
def _handle_probe(self, pres):

2
sleekxmpp/plugins/xep_0045.py
View file

@ -137,7 +137,7 @@ class XEP_0045(BasePlugin):
def handle_groupchat_invite(self, inv):
""" Handle an invite into a muc.
"""
logging.debug("MUC invite to %s from %s: %s", inv['from'], inv["from"], inv)
logging.debug("MUC invite to %s from %s: %s", inv['to'], inv["from"], inv)
if inv['from'] not in self.rooms.keys():
self.xmpp.event("groupchat_invite", inv)

3
sleekxmpp/plugins/xep_0153/vcard_avatar.py
View file

@ -119,7 +119,8 @@ class XEP_0153(BasePlugin):
if data is None:
return
elif data == '' or data != self.api['get_hash'](pres['to']):
self.api['reset_hash'](pres['from'], ifrom=pres['to'])
ifrom = pres['to'] if self.xmpp.is_component else None
self.api['reset_hash'](pres['from'], ifrom=ifrom)
self.xmpp.event('vcard_avatar_update', pres)
# =================================================================