diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-26 12:24:34 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-26 12:24:34 -0700 |
| commit | c9b2cf60431f415584c1d12a7855e0d2ac148ec4 (patch) | |
| tree | 2589aff4273b00e75a01235fda28a7641669ba55 | |
| parent | 16ec0f151a18030a948038aa6eca1f9f1b488928 (diff) | |
| parent | 35396d2977f9b19f6690b88a7c2f3c7f4f09356b (diff) | |
| download | slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.gz slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.bz2 slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.tar.xz slixmpp-c9b2cf60431f415584c1d12a7855e0d2ac148ec4.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | sleekxmpp/componentxmpp.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0045.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0153/vcard_avatar.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index 265ecd42..44f82e96 100644 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -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): diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py index 7fbb3d43..7cd25b2a 100644 --- a/sleekxmpp/plugins/xep_0045.py +++ b/sleekxmpp/plugins/xep_0045.py @@ -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) diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py index d61bf571..da90fdc5 100644 --- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py +++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py @@ -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) # ================================================================= |