glib r7331 - trunk/gio

[friemann svn gnome org]

Author: friemann
Date: Sun Aug 10 10:55:57 2008
New Revision: 7331
URL: http://svn.gnome.org/viewvc/glib?rev=7331&view=rev

Log:
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.


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfile.c

Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c	(original)
+++ trunk/gio/gfile.c	Sun Aug 10 10:55:57 2008
@@ -2447,6 +2447,8 @@
 	  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_propagate_error (error, my_error);
 	      return FALSE;
 	    }
+	  else
+	    g_clear_error (&my_error);
 	}
     }