glib r7466 - branches/glib-2-16/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Sep 11 19:07:35 2008
New Revision: 7466
URL: http://svn.gnome.org/viewvc/glib?rev=7466&view=rev

Log:
        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:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/gfile.c

Modified: branches/glib-2-16/gio/gfile.c
==============================================================================
--- branches/glib-2-16/gio/gfile.c	(original)
+++ branches/glib-2-16/gio/gfile.c	Thu Sep 11 19:07:35 2008
@@ -2381,6 +2381,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
@@ -2405,6 +2407,8 @@
 	      g_propagate_error (error, my_error);
 	      return FALSE;
 	    }
+	  else
+	    g_clear_error (&my_error);
 	}
     }