Changeset 9774

Timestamp:

06/08/08 18:54:59 (6 months ago)

Author:

js

Message:

Don't return 1 on error, but None. 1 could also be a message ID.

Files:

• trunk/src/chat_control.py (modified) (3 diffs)

trunk/src/chat_control.py

@@ -620 +620 @@
                 '''
                 if not message or message == '\n':
-                        return 1
+                        return None
 
                 ret = None
@@ -1454 +1454 @@
                 '''Send a message to contact'''
                 if message in ('', None, '\n') or self._process_command(message):
-                        return
+                        return None
 
                 # Do we need to process command for the message ?
@@ -1505 +1505 @@
                                 self._schedule_activity_timers()
 
-                ChatControlBase.send_message(self, message, keyID,
-                        type = 'chat', chatstate = chatstate_to_send,
-                        composing_xep = composing_xep,
-                        process_command = process_command)
-                self.print_conversation(message, self.contact.jid,
-                        encrypted = encrypted)
+                if ChatControlBase.send_message(self, message, keyID,
+                type = 'chat', chatstate = chatstate_to_send,
+                composing_xep = composing_xep,
+                process_command = process_command):
+                        self.print_conversation(message, self.contact.jid,
+                                encrypted = encrypted)
 
         def check_for_possible_paused_chatstate(self, arg):