summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorTom Nichols <tmnichols@gmail.com>2010-05-13 13:48:27 -0400
committerTom Nichols <tmnichols@gmail.com>2010-05-13 13:48:27 -0400
commit341c110b6ad0922cb47494e493fe8075e00cad65 (patch)
tree7d07a4166213ee1e8d067d6daee0185b96533005 /sleekxmpp/basexmpp.py
parenta92075a659866f611e7eefca6bf92b56272e48bd (diff)
parent7522839141e7dd5bd081a421a58b0962b705fdda (diff)
downloadslixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.gz
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.bz2
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.xz
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.zip
Merge branch 'master' of git@github.com:tomstrummer/SleekXMPP into hacks
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index b3247162..b011f7ba 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -271,12 +271,13 @@ class basexmpp(object):
name = self.roster[jid].get('name', '')
if show == 'unavailable':
logging.debug("%s %s got offline" % (jid, resource))
- if len(self.roster[jid]['presence']):
- del self.roster[jid]['presence'][resource]
- else:
+ del self.roster[jid]['presence'][resource]
+ if len(self.roster[jid]['presence']) == 0 and not self.roster[jid]['in_roster']:
del self.roster[jid]
if not wasoffline:
self.event("got_offline", presence)
+ else:
+ return False
self.event("changed_status", presence)
name = ''
if name: