From 5a878f829b6a54c8269ebf4205fe6427e171e6f6 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 26 Jul 2012 11:50:59 -0700 Subject: Fix error with session binding in components. --- sleekxmpp/componentxmpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') 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): -- cgit v1.2.3 From 3bff743d9f564b2cdcc81ace31f2dac7ec829896 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 26 Jul 2012 11:53:07 -0700 Subject: Fix logging statement for MUC invitations. --- sleekxmpp/plugins/xep_0045.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') 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) -- cgit v1.2.3 From 35396d2977f9b19f6690b88a7c2f3c7f4f09356b Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 26 Jul 2012 11:55:54 -0700 Subject: Don't include a 'from' JID when requesting vCards as a client. --- sleekxmpp/plugins/xep_0153/vcard_avatar.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sleekxmpp') 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) # ================================================================= -- cgit v1.2.3