aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2009-06-10 02:08:23 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2009-06-10 02:08:23 +0800
commit62a2f58de7ff809169787fa6de369c15465c69fd (patch)
treebc1578222ad2ad08bcfb872492c023a837692c56
parent83912b157904043cbb3d972bd3eb5f8e75f1d1c2 (diff)
parentf31d0fbeda0c03a619c2db2a84ef3181c579649b (diff)
downloadgsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar.gz
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar.bz2
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar.lz
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar.xz
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.tar.zst
gsoc2013-empathy-62a2f58de7ff809169787fa6de369c15465c69fd.zip
Merge branch 'ft-error-confusion'
-rw-r--r--libempathy/empathy-tp-file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 3a5826868..8b9b9a5e2 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -407,13 +407,14 @@ ft_operation_provide_or_accept_file_cb (TpChannel *proxy,
* report the method error.
*/
g_clear_error (&myerr);
- myerr = g_error_copy (error);
}
+
+ myerr = g_error_copy (error);
}
if (myerr != NULL)
{
- DEBUG ("Error: %s", error->message);
+ DEBUG ("Error: %s", myerr->message);
ft_operation_close_with_error (tp_file, myerr);
g_clear_error (&myerr);
return;