diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-08-04 15:58:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-08-04 15:58:25 +0000 |
| commit | 8fbbb4d9cb561bd61510b86c240147bae9c08620 (patch) | |
| tree | 81f8c24f424c2c0faf274f8f013931804a6ce03b /gio | |
| parent | 1c89700dc23bfde6f128326028d97b4ea99383cf (diff) | |
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
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/ChangeLog | 18 | ||||
| -rw-r--r-- | gio/gfile.c | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index 5588f364d..8023cb841 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 15d821b05..2b7d285f0 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); |