summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-14 14:10:52 -0700
committerLance Stout <lancestout@gmail.com>2011-06-14 14:10:52 -0700
commit5d11ab269d721a6360420798cfa5243e63bf8013 (patch)
treef1451e12b8ed7fe6787ad6aedd902f09ec6cba42
parent7a60e4b458ed58f2a130f5da24ad36bf62426329 (diff)
parentdd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff)
downloadslixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.gz
slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.bz2
slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.xz
slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.zip
Merge branch 'develop' into stream_features
-rw-r--r--sleekxmpp/basexmpp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index e2865d39..ab52dfbb 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -617,7 +617,7 @@ class BaseXMPP(XMLStream):
'in_roster': False}
# Alias to simplify some references.
- connections = self.roster[jid]['presence']
+ connections = self.roster[jid].get('presence', {})
# Determine if the user has just come online.
if not resource in connections: