Merge branch 'develop' into roster

Conflicts:
	sleekxmpp/basexmpp.py
This commit is contained in:
Lance Stout 2011-06-14 14:24:25 -07:00
commit a3597d6deb

View file

@ -678,6 +678,7 @@ class BaseXMPP(XMLStream):
elif not presence['type'] in ('available', 'unavailable') and \ elif not presence['type'] in ('available', 'unavailable') and \
not presence['type'] in presence.showtypes: not presence['type'] in presence.showtypes:
return return
self.event("changed_status", presence) self.event("changed_status", presence)
# Restore the old, lowercased name for backwards compatibility. # Restore the old, lowercased name for backwards compatibility.