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 5588f364dd261b967b346b928f1b2ff8c5dc73ae..8023cb84110f16305c53b999b140ec764bd0a23c 100644 (file)
--- 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 15d821b052ad9771a9fba50087e459c7b982ed65..2b7d285f0ed535aa5979eb20000eacfc0f34cb94 100644 (file)
--- 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);