r21702 - in /desktop/unstable/glib2.0/debian: changelog patches/30_metadata_symlinks.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Sep 29 23:02:51 2009
New Revision: 21702

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21702
Log:
30_metadata_symlinks.patch: stolen upstream. Get metadata to work 
with symbolic links. Closes: #548142.

Added:
    desktop/unstable/glib2.0/debian/patches/30_metadata_symlinks.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=21702&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue Sep 29 23:02:51 2009
@@ -1,9 +1,11 @@
-glib2.0 (2.22.0-2) UNRELEASED; urgency=low
+glib2.0 (2.22.0-2) unstable; urgency=low
 
   * Don’t install Python GDB macros for now, they only work with an 
     experimental GDB branch.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 23 Sep 2009 20:58:12 +0200
+  * 30_metadata_symlinks.patch: stolen upstream. Get metadata to work 
+    with symbolic links. Closes: #548142.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 30 Sep 2009 01:02:11 +0200
 
 glib2.0 (2.22.0-1) unstable; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/30_metadata_symlinks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/30_metadata_symlinks.patch?rev=21702&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/30_metadata_symlinks.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/30_metadata_symlinks.patch [utf-8] Tue Sep 29 23:02:51 2009
@@ -1,0 +1,40 @@
+From 6f1ce483eb136159f42b7dde3aa4466ba3e874c1 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl at redhat.com>
+Date: Mon, 28 Sep 2009 13:55:44 +0000
+Subject: Always report metadata on the path, not symlink target
+
+Metadata are really part of the pathname, not the target file
+(as they are stored by pathname, and for many metadata like icon position
+etc make not sense using the target data). So, even if nofollow
+is not specified we should not follow links for metadata.
+
+Ideally this should be implemented in the metadata extension in gvfs,
+but the extension API does not allow this, so we do it in gio.
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=593809
+---
+diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
+index 7076aac..0a063e9 100644
+--- a/gio/glocalfileinfo.c
++++ b/gio/glocalfileinfo.c
+@@ -1709,17 +1709,8 @@ _g_local_file_info_get (const char             *basename,
+   class = G_VFS_GET_CLASS (vfs);
+   if (class->local_file_add_info)
+     {
+-      const char *extra_target;
+-
+-      extra_target = path;
+-      if (!(flags & G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS) &&
+-          is_symlink &&
+-          !symlink_broken &&
+-          symlink_target != NULL)
+-        extra_target = symlink_target;
+-
+       class->local_file_add_info (vfs,
+-                                  extra_target,
++                                  path,
+                                   statbuf.st_dev,
+                                   attribute_matcher,
+                                   info,
+--
+cgit v0.8.2

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=21702&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Tue Sep 29 23:02:51 2009
@@ -3,4 +3,5 @@
 03_blacklist-directories.patch
 04_homedir_env.patch
 10_inotify_init1.patch
+30_metadata_symlinks.patch
 60_wait-longer-for-threads-to-die.patch