Merge branch 'develop' into stream_features

This commit is contained in:
Lance Stout 2011-06-14 14:10:52 -07:00
commit 5d11ab269d

View file

@ -617,7 +617,7 @@ class BaseXMPP(XMLStream):
'in_roster': False} 'in_roster': False}
# Alias to simplify some references. # Alias to simplify some references.
connections = self.roster[jid]['presence'] connections = self.roster[jid].get('presence', {})
# Determine if the user has just come online. # Determine if the user has just come online.
if not resource in connections: if not resource in connections: