Changeset 8454 for trunk

Timestamp:

08/06/07 13:45:29 (16 months ago)

Author:

asterix

Message:

fix /say command. fixes #3336

Files:

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

trunk/src/chat_control.py

@@ -555 +555 @@
 
         def send_message(self, message, keyID = '', type = 'chat', chatstate = None,
-        msg_id = None, composing_xep = None, resource = None):
+        msg_id = None, composing_xep = None, resource = None,
+        process_command = True):
                 '''Send the given message to the active tab. Doesn't return None if error
                 '''
@@ -561 +562 @@
                         return 1
 
-
-                if not self._process_command(message):
+                if not process_command or not self._process_command(message):
                         ret = MessageControl.send_message(self, message, keyID, type = type,
                                 chatstate = chatstate, msg_id = msg_id,
@@ -1285 +1285 @@
                         return
 
+                # Do we need to process command for the message ?
+                process_command = True
                 if message.startswith('/say'):
                         message = message[5:]
+                        process_command = False
 
                 # refresh timers
@@ -1330 +1333 @@
                                 
                 if not ChatControlBase.send_message(self, message, keyID, type = 'chat',
-                chatstate = chatstate_to_send, composing_xep = composing_xep):
+                chatstate = chatstate_to_send, composing_xep = composing_xep,
+                process_command = process_command):
                         self.print_conversation(message, self.contact.jid,
                                 encrypted = encrypted)