summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2011-05-11 14:49:52 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2011-05-11 14:49:52 -0400
commit434cb20f817b8e2d1a95089e21d0b0102e9ee0b5 (patch)
tree4976d9f3e9d88af7494db0b8aac2e7d663b297f7
parent260e43c90d77926327faad4488beb44e629b71a5 (diff)
downloadtelepathy-logger-434cb20f817b8e2d1a95089e21d0b0102e9ee0b5.tar.gz
Send newly created error instead of old one
-rw-r--r--telepathy-logger/streamed-media-channel.c2
-rw-r--r--telepathy-logger/text-channel.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/telepathy-logger/streamed-media-channel.c b/telepathy-logger/streamed-media-channel.c
index 28a3b52..b51b639 100644
--- a/telepathy-logger/streamed-media-channel.c
+++ b/telepathy-logger/streamed-media-channel.c
@@ -204,7 +204,7 @@ get_self_contact_cb (TpConnection *connection,
"Error resolving self handle for connection %s: %s)",
conn_path, error->message);
- _tpl_action_chain_terminate (ctx, error);
+ _tpl_action_chain_terminate (ctx, new_error);
g_error_free (new_error);
return;
}
diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
index c721358..338c93f 100644
--- a/telepathy-logger/text-channel.c
+++ b/telepathy-logger/text-channel.c
@@ -216,14 +216,14 @@ get_remote_contact_cb (TpConnection *connection,
GError *new_error = NULL;
new_error = g_error_new (error->domain, error->code,
"Failed to get remote contact: %s", error->message);
- _tpl_action_chain_terminate (ctx, error);
+ _tpl_action_chain_terminate (ctx, new_error);
}
else if (n_failed > 0)
{
- error = g_error_new (TPL_TEXT_CHANNEL_ERROR,
+ GError *new_error = g_error_new (TPL_TEXT_CHANNEL_ERROR,
TPL_TEXT_CHANNEL_ERROR_FAILED,
"Failed to prepare remote contact.");
- _tpl_action_chain_terminate (ctx, error);
+ _tpl_action_chain_terminate (ctx, new_error);
}
else
{