diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-21 13:03:52 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 15:23:34 +0800 |
| commit | b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0 (patch) | |
| tree | 8cfb3398eb3bd95d37a6ef85171103034b1488a5 /libempathy/empathy-tp-chat.c | |
| parent | 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306 (diff) | |
| download | gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar.gz gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar.bz2 gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar.lz gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar.xz gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.tar.zst gsoc2013-empathy-b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0.zip | |
Use dbus-error from delivery report for better errors
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index b8e4cdf0c..4b3bca4df 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -322,6 +322,7 @@ handle_delivery_report (EmpathyTpChat *self, gboolean valid; GPtrArray *echo; const gchar *message_body = NULL; + const gchar *delivery_dbus_error; header = tp_message_peek (message, 0); if (header == NULL) @@ -335,6 +336,8 @@ handle_delivery_report (EmpathyTpChat *self, if (!valid) delivery_error = TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; + delivery_dbus_error = tp_asv_get_string (header, "delivery-dbus-error"); + /* TODO: ideally we should use tp-glib API giving us the echoed message as a * TpMessage. (fdo #35884) */ echo = tp_asv_get_boxed (header, "delivery-echo", @@ -347,7 +350,8 @@ handle_delivery_report (EmpathyTpChat *self, message_body = tp_asv_get_string (echo_body, "content"); } - g_signal_emit (self, signals[SEND_ERROR], 0, message_body, delivery_error); + g_signal_emit (self, signals[SEND_ERROR], 0, message_body, + delivery_error, delivery_dbus_error); out: tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (priv->channel), @@ -449,7 +453,7 @@ message_send_cb (GObject *source, * we'll have rebased EmpathyTpChat on top of TpTextChannel we'll be able * to use the user_data pointer to pass the message and fix this. */ g_signal_emit (chat, signals[SEND_ERROR], 0, - NULL, error_to_text_send_error (error)); + NULL, error_to_text_send_error (error), NULL); g_error_free (error); } @@ -1521,9 +1525,9 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__STRING_UINT, + _empathy_marshal_VOID__STRING_UINT_STRING, G_TYPE_NONE, - 2, G_TYPE_STRING, G_TYPE_UINT); + 3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING); signals[CHAT_STATE_CHANGED] = g_signal_new ("chat-state-changed", |