summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-04-20 18:10:22 -0700
committerLance Stout <lancestout@gmail.com>2014-04-20 18:10:22 -0700
commitef2f5d29788218f679cd878e4e25bbd61545fef4 (patch)
treee65f1cd10ddc618101c21acfe264f74037fb6450 /sleekxmpp/plugins
parent62671e0f56c0c24bb33b99377011267b8769387b (diff)
parent93869f77a076eda03a9719e9b854dfc9d0597264 (diff)
downloadslixmpp-ef2f5d29788218f679cd878e4e25bbd61545fef4.tar.gz
slixmpp-ef2f5d29788218f679cd878e4e25bbd61545fef4.tar.bz2
slixmpp-ef2f5d29788218f679cd878e4e25bbd61545fef4.tar.xz
slixmpp-ef2f5d29788218f679cd878e4e25bbd61545fef4.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into developsleek-1.2.51.2.5
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0153/vcard_avatar.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
index 271ac995..ec1ae782 100644
--- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py
+++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
@@ -124,10 +124,12 @@ class XEP_0153(BasePlugin):
log.debug('Could not retrieve vCard for %s' % jid)
def _recv_presence(self, pres):
- if pres['muc']['affiliation']:
- # Don't process vCard avatars for MUC occupants
- # since they all share the same bare JID.
- return
+ try:
+ if pres['muc']['affiliation']:
+ # Don't process vCard avatars for MUC occupants
+ # since they all share the same bare JID.
+ return
+ except: pass
if not pres.match('presence/vcard_temp_update'):
self.api['set_hash'](pres['from'], args=None)