summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2010-01-27 19:38:14 -0800
committerNathan Fritz <fritzy@netflint.net>2010-01-27 19:38:14 -0800
commit50ec99eee0e15d6b8d5edcf167eb59d558e0a2c6 (patch)
tree0841edd7f08ae3a2d4a314c9f284383a6f29de6d
parent3dbd496de8b6d358b657eada91acc6b71455ffbf (diff)
parent980005db5835786d0e8917d5a04b13646cc005fe (diff)
downloadslixmpp-50ec99eee0e15d6b8d5edcf167eb59d558e0a2c6.tar.gz
slixmpp-50ec99eee0e15d6b8d5edcf167eb59d558e0a2c6.tar.bz2
slixmpp-50ec99eee0e15d6b8d5edcf167eb59d558e0a2c6.tar.xz
slixmpp-50ec99eee0e15d6b8d5edcf167eb59d558e0a2c6.zip
Merge branch 'develop'
-rw-r--r--sleekxmpp/basexmpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 74605944..100bef90 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -252,7 +252,7 @@ class basexmpp(object):
if presence['type'] in ('subscribe', 'subscribed', 'unsubscribe', 'unsubscribed'):
self.event('changed_subscription', presence)
return
- elif not presence['type'] in ('available', 'unavailable'):
+ elif not presence['type'] in ('available', 'unavailable') and not presence['type'] in presence.showtypes:
return
jid = presence['from'].bare
resource = presence['from'].resource
@@ -280,7 +280,7 @@ class basexmpp(object):
del self.roster[jid]['presence'][resource]
else:
del self.roster[jid]
- elif oldroster != self.roster.get(jid, {'presence': {}})['presence'].get(resource, {}) and show != 'unavailable':
+ elif oldroster != self.roster.get(jid, {'presence': {}})['presence'].get(resource, {}):
self.event("changed_status", presence)
name = ''
if name: