aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2009-08-31 08:13:00 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2009-08-31 08:17:49 +0800
commita0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b (patch)
tree4c5e99d6a02d87cce81e9204bb31653ea8b38c41 /libempathy
parent04fbe6bf259fd8fb75c8ed4c4e135fb4187045f5 (diff)
downloadgsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar.gz
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar.bz2
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar.lz
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar.xz
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.tar.zst
gsoc2013-empathy-a0ee1ca8fbbbe6d34c123eb46b32fc4f1e75779b.zip
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.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chat.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 69057a878..7953b69e2 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",