From 3012297c2c6bf45b3a0e7abf90c1ac4d1f11c6bf Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 3 Jun 2013 08:48:46 +0200
Subject: [PATCH] don't pass a useless argument to callback. Fixes #7357

---
 src/chat_control.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chat_control.py b/src/chat_control.py
index b7a919f315..e2d6f6d5cd 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -2365,10 +2365,10 @@ class ChatControl(ChatControlBase):
                 gobject.source_remove(self.possible_inactive_timeout_id)
                 self._schedule_activity_timers()
 
-        def _on_sent(msg, contact, message, encrypted, xhtml, label, old_txt):
-            id_ = msg.getID()
-            if contact.supports(NS_RECEIPTS) and gajim.config.get_per('accounts',
-            self.account, 'request_receipt'):
+        def _on_sent(msg_stanza, message, encrypted, xhtml, label, old_txt):
+            id_ = msg_stanza.getID()
+            if self.contact.supports(NS_RECEIPTS) and gajim.config.get_per(
+            'accounts', self.account, 'request_receipt'):
                 xep0184_id = id_
             else:
                 xep0184_id = None
@@ -2390,8 +2390,8 @@ class ChatControl(ChatControlBase):
 
         ChatControlBase.send_message(self, message, keyID, type_='chat',
             chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent,
-            callback_args=[contact, message, encrypted, xhtml,
-            self.get_seclabel(), self.last_sent_txt], process_commands=process_commands,
+            callback_args=[message, encrypted, xhtml, self.get_seclabel(),
+            self.last_sent_txt], process_commands=process_commands,
             attention=attention)
 
     def check_for_possible_paused_chatstate(self, arg):
-- 
GitLab