diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-24 11:51:03 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-24 11:51:03 -0700 |
| commit | 19a78f63f4a24d7a5ff568608d4323f773d785e2 (patch) | |
| tree | 5cffabf943f3aeba1b5763a84e28caf0ed3ab1d8 /sleekxmpp | |
| parent | e20610ab80b1edf3be84a2a5a0fafc22a35d3aee (diff) | |
| parent | c7ec6a72cda41c7dbbdd4193d795b5dd8df4843f (diff) | |
| download | slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.gz slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.bz2 slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.xz slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 7 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0085/chat_states.py | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 282c0c31..244d19c5 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -226,13 +226,6 @@ class BaseXMPP(XMLStream): - The send queue processor - The scheduler """ - if 'xep_0115' in self.plugin: - name = 'xep_0115' - if not hasattr(self.plugin[name], 'post_inited'): - if hasattr(self.plugin[name], 'post_init'): - self.plugin[name].post_init() - self.plugin[name].post_inited = True - for name in self.plugin: if not hasattr(self.plugin[name], 'post_inited'): if hasattr(self.plugin[name], 'post_init'): diff --git a/sleekxmpp/plugins/xep_0085/chat_states.py b/sleekxmpp/plugins/xep_0085/chat_states.py index 17e19d35..17f82afd 100644 --- a/sleekxmpp/plugins/xep_0085/chat_states.py +++ b/sleekxmpp/plugins/xep_0085/chat_states.py @@ -52,4 +52,5 @@ class XEP_0085(BasePlugin): def _handle_chat_state(self, msg): state = msg['chat_state'] log.debug("Chat State: %s, %s", state, msg['from'].jid) + self.xmpp.event('chatstate', msg) self.xmpp.event('chatstate_%s' % state, msg) |