[empathy: 1/5] Use char* not EmpathyMessage in TpChat:send-error

[Will Thompson <wjt src gnome org>]

commit a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b
Author: Will Thompson <will thompson collabora co uk>
Date:   Mon Aug 31 01:13:00 2009 +0100

    Use char* not EmpathyMessage in TpChat:send-error
    
    The only consumer of this signal just extracts the body from the
    EmpathyMessage. It will be easier to handle the SendError D-Bus signal
    if we don't have to construct an EmpathyMessage from it.

 libempathy-gtk/empathy-chat.c |    4 ++--
 libempathy/empathy-tp-chat.c  |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index a979c9e..c08b49c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -523,7 +523,7 @@ chat_message_received_cb (EmpathyTpChat  *tp_chat,
 
 static void
 chat_send_error_cb (EmpathyTpChat          *tp_chat,
-		    EmpathyMessage         *message,
+		    const gchar            *message_body,
 		    TpChannelTextSendError  error_code,
 		    EmpathyChat            *chat)
 {
@@ -552,7 +552,7 @@ chat_send_error_cb (EmpathyTpChat          *tp_chat,
 	}
 
 	str = g_strdup_printf (_("Error sending message '%s': %s"),
-			       empathy_message_get_body (message),
+			       message_body,
 			       error);
 	empathy_chat_view_append_event (chat->view, str);
 	g_free (str);
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 69057a8..7953b69 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -359,7 +359,8 @@ tp_chat_send_cb (TpChannel    *proxy,
 
 	if (error) {
 		DEBUG ("Error: %s", error->message);
-		g_signal_emit (chat, signals[SEND_ERROR], 0, message,
+		g_signal_emit (chat, signals[SEND_ERROR], 0,
+			       empathy_message_get_body (message),
 			       TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN);
 	}
 }
@@ -1168,9 +1169,9 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_UINT,
+			      _empathy_marshal_VOID__STRING_UINT,
 			      G_TYPE_NONE,
-			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_UINT);
+			      2, G_TYPE_STRING, G_TYPE_UINT);
 
 	signals[CHAT_STATE_CHANGED] =
 		g_signal_new ("chat-state-changed",