Merge branch 'develop' into roster

Conflicts: sleekxmpp/basexmpp.py
2011-06-14 14:24:25 -07:00 · 2011-06-14 14:24:25 -07:00 · a3597d6deb
commit a3597d6deb
parent 937dce8e65 dd41a85efc
1 changed files with 1 additions and 0 deletions
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@ -678,6 +678,7 @@ class BaseXMPP(XMLStream):
        elif not presence['type'] in ('available', 'unavailable') and \
             not presence['type'] in presence.showtypes:
            return
+
        self.event("changed_status", presence)

 # Restore the old, lowercased name for backwards compatibility.