summaryrefslogtreecommitdiff
path: root/sleekxmpp/roster
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-22 20:10:07 -0700
committerLance Stout <lancestout@gmail.com>2012-10-22 20:10:07 -0700
commit3655827ef2e268e9ab327e4a6c788c3e336146e0 (patch)
tree06a916dbfb9ce40897fd56a2051bbeeea64d6e17 /sleekxmpp/roster
parent12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f (diff)
parentc5046b9c91a77488424c1f77407a2875a9fea45a (diff)
downloadslixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.gz
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.bz2
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.xz
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/roster')
-rw-r--r--sleekxmpp/roster/item.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/roster/item.py b/sleekxmpp/roster/item.py
index 6e9c0d01..ae194e0a 100644
--- a/sleekxmpp/roster/item.py
+++ b/sleekxmpp/roster/item.py
@@ -479,11 +479,11 @@ class RosterItem(object):
self.xmpp.event('roster_subscription_removed', presence)
def handle_probe(self, presence):
- if self['to']:
+ if self['from']:
self.send_last_presence()
if self['pending_out']:
self.subscribe()
- if not self['to']:
+ if not self['from']:
self._unsubscribed()
def reset(self):