From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 4 Aug 2008 15:58:25 +0000 (+0000)
Subject: Bug 546017 – Don't copy attributes when copying a symlink
X-Git-Tag: GLIB_2_17_5~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fbbb4d9cb561bd61510b86c240147bae9c08620;p=platform%2Fupstream%2Fglib.git

Bug 546017 – Don't copy attributes when copying a symlink

2008-08-04  Matthias Clasen  <mclasen@redhat.com>

        Bug 546017 – Don't copy attributes when copying a symlink

        * gfile.c (g_file_copy_attributes): Specify
        G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS in the call to
        g_file_set_attributes_from_info. Patch by Christian Kellner


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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 5588f36..8023cb8 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,21 @@
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 546017 – Don't copy attributes when copying a symlink
+
+	* gfile.c (g_file_copy_attributes): Specify
+	G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS in the call to 
+	g_file_set_attributes_from_info. Patch by Christian Kellner
+
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gemblemedicon.[hc]: 
+	* gio.symbols:
+	* gemblem.[hc]: Add GEmblem to make the emblem mechanism
+	a bit more extensible. Work by Clemens Buss.
+
+	* gioenums.h: Add GEmblemOrigin.
+	* Makefile.am: Glue
+
 2008-08-03  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	Bug 546079 – leak in xdgmime
diff --git a/gio/gfile.c b/gio/gfile.c
index 15d821b..2b7d285 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -2169,7 +2169,8 @@ g_file_copy_attributes (GFile           *source,
   if  (info)
     {
       res = g_file_set_attributes_from_info (destination,
-					     info, 0,
+					     info,
+                         G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 					     cancellable,
 					     error);
       g_object_unref (info);