jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-10-22 20:10:07 -07:00
commit 3655827ef2
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleekxmpp/jid.py
View File

@ -421,11 +421,10 @@ class JID(object):
if jid is None or jid == '': if jid is None or jid == '':
jid = '' jid = ''
if jid in JID_CACHE:
self._jid = JID_CACHE[jid]
else:
if not jid: if not jid:
jid = (None, None, None) jid = (None, None, None)
elif jid in JID_CACHE:
jid = JID_CACHE[jid]
elif not isinstance(jid, JID): elif not isinstance(jid, JID):
jid = _parse_jid(jid) jid = _parse_jid(jid)
else: else:

4
sleekxmpp/roster/item.py
View File

@ -479,11 +479,11 @@ class RosterItem(object):
self.xmpp.event('roster_subscription_removed', presence) self.xmpp.event('roster_subscription_removed', presence)
def handle_probe(self, presence): def handle_probe(self, presence):
if self['to']: if self['from']:
self.send_last_presence() self.send_last_presence()
if self['pending_out']: if self['pending_out']:
self.subscribe() self.subscribe()
if not self['to']: if not self['from']:
self._unsubscribed() self._unsubscribed()
def reset(self): def reset(self):