From 26f2a3b93c73e7dc83122b57fc838cc0da8f9c3d Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Sun, 10 Aug 2008 10:55:57 +0000 Subject: [PATCH] =?utf8?q?Bug=20547080=20=E2=80=93=20g=5Ffile=5Fcopy=20lea?= =?utf8?q?ks=20expected=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-10 Felix Riemann 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. svn path=/trunk/; revision=7331 --- gio/ChangeLog | 7 +++++++ gio/gfile.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/gio/ChangeLog b/gio/ChangeLog index b7e21b70..3dfdee5b 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,10 @@ +2008-08-10 Felix Riemann + + 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. + 2008-08-09 Loïc Minier Bug 535124 – umask 002 not being applied for new directories, new diff --git a/gio/gfile.c b/gio/gfile.c index 52eb6df3..83643ea5 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -2447,6 +2447,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 @@ -2471,6 +2473,8 @@ g_file_copy (GFile *source, g_propagate_error (error, my_error); return FALSE; } + else + g_clear_error (&my_error); } } -- 2.34.1