Bug 547080 – g_file_copy leaks expected errors

2008-08-10  Felix Riemann  <friemann@svn.gnome.org>

	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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index b7e21b7..3dfdee5 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-10  Felix Riemann  <friemann@svn.gnome.org>
+
+       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  <lool@dooz.org>
 
        Bug 535124 – umask 002 not being applied for new directories, new

diff --git a/gio/gfile.c b/gio/gfile.c
index 52eb6df..83643ea 100644 (file)
--- 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);
        }
     }