glib r7465 - branches/glib-2-16/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Sep 11 19:05:47 2008
New Revision: 7465
URL: http://svn.gnome.org/viewvc/glib?rev=7465&view=rev

Log:
        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



Modified:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/gfile.c

Modified: branches/glib-2-16/gio/gfile.c
==============================================================================
--- branches/glib-2-16/gio/gfile.c	(original)
+++ branches/glib-2-16/gio/gfile.c	Thu Sep 11 19:05:47 2008
@@ -2103,7 +2103,8 @@
   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);