From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 15 Apr 2011 12:37:53 +0000 (+0200)
Subject: use TpTextChannel:message-sent
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=fde2bece1e5729ce6907f22a6ae48bb3d1eccab4

use TpTextChannel:message-sent
---

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 440ceda7..b21ebeb1 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -361,29 +361,28 @@ message_received_cb (TpTextChannel   *channel,
 }
 
 static void
-tp_chat_sent_cb (TpChannel   *channel,
-		 guint        timestamp,
-		 guint        message_type,
-		 const gchar *message_body,
-		 gpointer     user_data,
-		 GObject     *chat_)
-{
-	EmpathyTpChat *chat = EMPATHY_TP_CHAT (chat_);
-	EmpathyTpChatPriv *priv = GET_PRIV (chat);
+message_sent_cb (TpTextChannel   *channel,
+		 TpMessage *message,
+		 TpMessageSendingFlags flags,
+		 gchar              *token,
+		 EmpathyTpChat      *chat)
+{
+	gchar *message_body;
 
-	if (priv->channel == NULL)
-		return;
+	message_body = tp_message_to_text (message, NULL);
 
 	DEBUG ("Message sent: %s", message_body);
 
 	tp_chat_build_message (chat,
 			       FALSE,
 			       0,
-			       message_type,
-			       timestamp,
+			       tp_message_get_message_type (message),
+			       tp_message_get_received_timestamp (message),
 			       0,
 			       message_body,
 			       0);
+
+	g_free (message_body);
 }
 
 static void
@@ -848,10 +847,9 @@ check_almost_ready (EmpathyTpChat *chat)
 
 	list_pending_messages (chat);
 
-	tp_cli_channel_type_text_connect_to_sent (priv->channel,
-						  tp_chat_sent_cb,
-						  NULL, NULL,
-						  G_OBJECT (chat), NULL);
+	tp_g_signal_connect_object (priv->channel, "message-sent",
+		G_CALLBACK (message_sent_cb), chat, 0);
+
 	tp_cli_channel_type_text_connect_to_send_error (priv->channel,
 							tp_chat_send_error_cb,
 							NULL, NULL,