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-08-24 11:51:03 -07:00
commit 19a78f63f4
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleekxmpp/basexmpp.py
View File

@ -226,13 +226,6 @@ class BaseXMPP(XMLStream):
- The send queue processor - The send queue processor
- The scheduler - 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: for name in self.plugin:
if not hasattr(self.plugin[name], 'post_inited'): if not hasattr(self.plugin[name], 'post_inited'):
if hasattr(self.plugin[name], 'post_init'): if hasattr(self.plugin[name], 'post_init'):

1
sleekxmpp/plugins/xep_0085/chat_states.py
View File

@ -52,4 +52,5 @@ class XEP_0085(BasePlugin):
def _handle_chat_state(self, msg): def _handle_chat_state(self, msg):
state = msg['chat_state'] state = msg['chat_state']
log.debug("Chat State: %s, %s", state, msg['from'].jid) log.debug("Chat State: %s, %s", state, msg['from'].jid)
self.xmpp.event('chatstate', msg)
self.xmpp.event('chatstate_%s' % state, msg) self.xmpp.event('chatstate_%s' % state, msg)