Bug 526796 – Wrong order of arguments in g_file_copy's fallback

        * gfile.c (file_copy_fallback): Fix the argument order. Patch
        by Christian Kellner.

svn path=/trunk/; revision=6830

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 1d96b58dccbf569199346ab0dd1341c68929abd9..f705cb1d1fbf0e689846f418222e5486343ea8fb 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 526796 – Wrong order of arguments in g_file_copy's fallback
+
+       * gfile.c (file_copy_fallback): Fix the argument order. Patch
+       by Christian Kellner.
+
 2008-04-04  Sebastien Bacher  <seb128@ubuntu.com>
 
        * gunixmounts.c: (g_unix_mount_guess_should_display):

diff --git a/gio/gfile.c b/gio/gfile.c
index c908ad6c353a3cd00eec8b6f3acd233239372ca5..b3da055c3939f667ad6e75589fff1d2a482f4ba7 100644 (file)
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -2300,8 +2300,9 @@ file_copy_fallback (GFile                  *source,
   if (flags & G_FILE_COPY_OVERWRITE)
     {
       out = (GOutputStream *)g_file_replace (destination,
-                                            NULL, 0,
+                                            NULL,
                                             flags & G_FILE_COPY_BACKUP,
+                                             0,
                                             cancellable, error);
     }
   else