Changeset 9772

Timestamp:

06/08/08 17:51:55 (6 months ago)

Author:

js

Message:

* Fix passing of message ID.
* Don't asnwer to receipt requests from users not in roster.

Location:

trunk/src

Files:

• chat_control.py (modified) (4 diffs)
• common/connection_handlers.py (modified) (1 diff)
• common/connection.py (modified) (2 diffs)

trunk/src/chat_control.py

@@ -622 +622 @@
                         return 1
 
+                ret = None
+
                 if not process_command or not self._process_command(message):
                         ret = MessageControl.send_message(self, message, keyID, type = type,
@@ -627 +629 @@
                                 composing_xep = composing_xep, resource = resource,
                                 user_nick = self.user_nick)
-                        if ret:
-                                return ret
+
                         # Record message history
                         self.save_sent_message(message)
@@ -638 +639 @@
                 message_buffer = self.msg_textview.get_buffer()
                 message_buffer.set_text('') # clear message buffer (and tv of course)
+
+                return ret
 
         def save_sent_message(self, message):
@@ -1502 +1505 @@
                                 self._schedule_activity_timers()
 
-                if not 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)
+                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):

trunk/src/common/connection_handlers.py

@@ -1695 +1695 @@
                 # TODO: We shouldn't answer if we're invisible!
                 if msg.getTag('request', namespace='urn:xmpp:receipts') and \
-                gajim.config.get_per('accounts', self.name, 'answer_receipt'):
+                gajim.config.get_per('accounts', self.name, 'answer_receipt') \
+                and gajim.contacts.get_contact_from_full_jid(self.name, frm). \
+                sub not in (u'to', u'none'):
                         receipt = common.xmpp.Message(to = jid, typ = 'chat')
                         receipt.setID(msg.getID())

trunk/src/common/connection.py

@@ -1127 +1127 @@
                                 msg_iq = session.encrypt_stanza(msg_iq)
 
-                self.connection.send(msg_iq)
+                msg_id = self.connection.send(msg_iq)
                 if not forward_from and session and session.is_loggable():
                         no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')\
@@ -1148 +1148 @@
                                                 self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                 self.dispatch('MSGSENT', (jid, msg, keyID))
+
+                return msg_id
 
         def send_stanza(self, stanza):