From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Tue, 8 Apr 2008 01:59:47 +0000 (+0000)
Subject:         Bug 526796 – Wrong order of arguments in g_file_copy's fallback
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f0ba12f19f25a4bf619985774b64988100807c94;p=dana%2Fcg-glib.git

    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 1d96b58d..f705cb1d 100644
--- 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 c908ad6c..b3da055c 100644
--- 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