Changeset 213

Timestamp:

07/08/04 21:46:24 (4 years ago)

Author:

asterix

Message:

support of error messages

Location:

trunk

Files:

• core/core.py (modified) (2 diffs)
• plugins/gtkgui/gtkgui.py (modified) (2 diffs)

trunk/core/core.py

@@ -119 +119 @@
         def messageCB(self, con, msg):
                 """Called when we recieve a message"""
-                self.hub.sendPlugin('MSG', self.connexions[con], \
-                        (str(msg.getFrom()), msg.getBody()))
+                if msg.getType() == 'error':
+                        self.hub.sendPlugin('MSGERROR', self.connexions[con], \
+                                (str(msg.getFrom()), msg.getErrorCode(), msg.getError(), \
+                                msg.getBody()))
+                else:
+                        self.hub.sendPlugin('MSG', self.connexions[con], \
+                                (str(msg.getFrom()), msg.getBody()))
         # END messageCB
 
@@ -523 +528 @@
                         gc.hub.register(mod, 'NOTIFY')
                         gc.hub.register(mod, 'MSG')
+                        gc.hub.register(mod, 'MSGERROR')
                         gc.hub.register(mod, 'MSGSENT')
                         gc.hub.register(mod, 'SUBSCRIBED')

trunk/plugins/gtkgui/gtkgui.py

@@ -1591 +1591 @@
                 self.roster.on_message(jid, array[1], account)
                 
+        def handle_event_msgerror(self, account, array):
+                #('MSG', account, (user, error_code, error_msg, msg))
+                jid = string.split(array[0], '/')[0]
+                if string.find(jid, "@") <= 0:
+                        jid = string.replace(jid, '@', '')
+                self.roster.on_message(jid, _("error while sending") + " \"%s\" ( %s )"%\
+                        (array[3], array[2]), account)
+                
         def handle_event_subscribe(self, account, array):
                 #('SUBSCRIBE', account, (jid, text))
@@ -1696 +1704 @@
                         elif ev[0] == 'MSG':
                                 self.handle_event_msg(ev[1], ev[2])
+                        elif ev[0] == 'MSGERROR':
+                                self.handle_event_msgerror(ev[1], ev[2])
                         elif ev[0] == 'SUBSCRIBE':
                                 self.handle_event_subscribe(ev[1], ev[2])