From 8fbbb4d9cb561bd61510b86c240147bae9c08620 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Aug 2008 15:58:25 +0000 Subject: [PATCH] =?utf8?q?Bug=20546017=20=E2=80=93=20Don't=20copy=20attrib?= =?utf8?q?utes=20when=20copying=20a=20symlink?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-04 Matthias Clasen 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 --- gio/ChangeLog | 18 ++++++++++++++++++ gio/gfile.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 5588f364..8023cb84 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,21 @@ +2008-08-04 Matthias Clasen + + 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 + + * 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 Bug 546079 – leak in xdgmime diff --git a/gio/gfile.c b/gio/gfile.c index 15d821b0..2b7d285f 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); -- 2.34.1