From 62b42594dba6ff0b4f88fd84cfdc335407230a36 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 Sep 2008 19:07:35 +0000 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20Bug=20547080=20?= =?UTF-8?q?=E2=80=93=20g=5Ffile=5Fcopy=20leaks=20expected=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gfile.c: (g_file_copy): Clear G_IO_ERROR_NOT_SUPPORTED errors before trying the next fallback routine. svn path=/branches/glib-2-16/; revision=7466 --- gio/ChangeLog | 10 ++++++++++ gio/gfile.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/gio/ChangeLog b/gio/ChangeLog index e7f0e3f8c..9c5a7784d 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,13 @@ +2008-09-11 Matthias Clasen + + Merge from trunk + + Bug 547080 – g_file_copy leaks expected errors + + * gfile.c: (g_file_copy): Clear G_IO_ERROR_NOT_SUPPORTED + errors before trying the next fallback routine. Patch by + Felix Riemann + 2008-09-11 Matthias Clasen Merge from trunk diff --git a/gio/gfile.c b/gio/gfile.c index 8531a7fa3..7406a65a8 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -2381,6 +2381,8 @@ g_file_copy (GFile *source, g_propagate_error (error, my_error); return FALSE; } + else + g_clear_error (&my_error); } /* If the types are different, and the destination method failed @@ -2405,6 +2407,8 @@ g_file_copy (GFile *source, g_propagate_error (error, my_error); return FALSE; } + else + g_clear_error (&my_error); } }