Merge branch 'develop' into exceptions

This commit is contained in:
Lance Stout 2011-06-15 10:56:49 -07:00
commit 393d702e77

View file

@ -640,7 +640,8 @@ class BaseXMPP(XMLStream):
log.debug("%s %s got offline" % (jid, resource)) log.debug("%s %s got offline" % (jid, resource))
del connections[resource] del connections[resource]
if not connections and not self.roster[jid]['in_roster']: if not connections and \
not self.roster[jid].get('in_roster', False):
del self.roster[jid] del self.roster[jid]
if not was_offline: if not was_offline:
self.event("got_offline", presence) self.event("got_offline", presence)