From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 28 Mar 2008 13:57:29 +0000 (+0000)
Subject: Fix up last commit.
X-Git-Tag: GLIB_2_17_0~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4824b7dbb072a7d19f579f73bda098713ccbc87a;p=platform%2Fupstream%2Fglib.git

Fix up last commit.

2008-03-28  Alexander Larsson  <alexl@redhat.com>

        * gfile.c:
        (copy_stream_with_progress):
	Fix up last commit.



svn path=/trunk/; revision=6766
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index a2e9704..60bce61 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -2,6 +2,12 @@
 
         * gfile.c:
         (copy_stream_with_progress):
+	Fix up last commit.
+	
+2008-03-28  Alexander Larsson  <alexl@redhat.com>
+
+        * gfile.c:
+        (copy_stream_with_progress):
         (file_copy_fallback):
 	Fallback to g_file_query_info for source size
 	if g_file_input_stream_query_info fails. (#524579)
diff --git a/gio/gfile.c b/gio/gfile.c
index b592ed8..9e65a4b 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -2118,7 +2118,6 @@ static gboolean
 copy_stream_with_progress (GInputStream           *in,
 			   GOutputStream          *out,
                            GFile                  *source,
-                           GFileQueryInfoFlags     info_flags,
 			   GCancellable           *cancellable,
 			   GFileProgressCallback   progress_callback,
 			   gpointer                progress_callback_data,