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

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. svn path=/branches/glib-2-16/; revision=6831
dieterv · Apr 8, 2008 · 118e24c · 118e24c
1 parent 5be1985
commit 118e24c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/gio/ChangeLog b/gio/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	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
@@ -2263,8 +2263,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