Merge branch 'master' into develop

sleekxmpp/jid.py

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

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):