summaryrefslogtreecommitdiff
path: root/src/connection.py
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-03-19 03:30:51 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-03-19 03:30:51 +0000
commita923d32ee47fab1aa5de01a1c41a8082c108a649 (patch)
tree0f3248fb54f48a149bc71b43dbd7088da98f32b6 /src/connection.py
parentd25f061a8bfc71317f045c6b78d98777cd871098 (diff)
downloadpoezio-a923d32ee47fab1aa5de01a1c41a8082c108a649.tar.gz
poezio-a923d32ee47fab1aa5de01a1c41a8082c108a649.tar.bz2
poezio-a923d32ee47fab1aa5de01a1c41a8082c108a649.tar.xz
poezio-a923d32ee47fab1aa5de01a1c41a8082c108a649.zip
fixed #1230 Do not put the 'there is a message' color when the message is from the MUC history
Diffstat (limited to 'src/connection.py')
-rw-r--r--src/connection.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/connection.py b/src/connection.py
index 5aa9f838..9b047da9 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -86,8 +86,8 @@ class Connection(threading.Thread):
self.client.RegisterHandler('iq', self.on_get_time, typ='get', ns="urn:xmpp:time")
self.client.RegisterHandler('iq', self.on_get_version, typ='get', ns=xmpp.NS_VERSION)
self.client.RegisterHandler('presence', self.handler_presence)
- self.client.RegisterHandler('message', self.handler_delayed_message, ns=xmpp.NS_DELAY, makefirst=True)
self.client.RegisterHandler('message', self.handler_message)
+ # self.client.RegisterHandler('message', self.handler_delayed_message, ns=xmpp.NS_DELAY)
def handler_presence(self, connection, presence):
fro = presence.getFrom()
@@ -98,12 +98,15 @@ class Connection(threading.Thread):
self.handler.emit('on-connected', jid=fro)
return
self.handler.emit('room-presence', stanza=presence)
+ raise xmpp.protocol.NodeProcessed
def handler_delayed_message(self, connection, message):
- pass
+ self.handler.emit('room-delayed-message', stanza=message)
+ raise xmpp.protocol.NodeProcessed
def handler_message(self, connection, message):
self.handler.emit('room-message', stanza=message)
+ raise xmpp.protocol.NodeProcessed
def handler_error(self, connection, error):
pass
@@ -119,5 +122,4 @@ class Connection(threading.Thread):
self.handler.emit('send-version', iq_obj=iq)
def on_get_time(self, connection, iq):
- open('caca', 'w').write('works')
self.handler.emit('send-time', iq_obj=iq)