rpms/gvfs/F-11 gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch, NONE, 1.1 gvfs.spec, 1.140, 1.141

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27227

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch 
Log Message:
* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-10
- Fix bad mount prefix stripping (part of #509612)


gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch:
 gdaemonfile.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch ---
>From 3ba4f3e3deae84cbd5ffe8e7bfd2803d96e7e2e6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 5 Aug 2009 16:50:28 +0200
Subject: [PATCH] Don't strip mount prefix when returning local mapped path

On complex URIs like 'dav://server/gallery/w/TestAlbum',
g_file_get_path () would return malformed path with the middle
path '/gallery/w' stripped. This patch ensures full path to be
returned.

See bug #590862 for more details.
---
 client/gdaemonfile.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 8e14929..be9baef 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -167,7 +167,6 @@ g_daemon_file_get_path (GFile *file)
 {
   GDaemonFile *daemon_file = G_DAEMON_FILE (file);
   GMountInfo *mount_info;
-  const char *rel_path;
   char *path;
 
   /* This is a sync i/o call, which is a bit unfortunate, as
@@ -185,12 +184,7 @@ g_daemon_file_get_path (GFile *file)
   path = NULL;
   
   if (mount_info->fuse_mountpoint)
-    {
-      rel_path = daemon_file->path +
-	strlen (mount_info->mount_spec->mount_prefix);
-
-      path = g_build_filename (mount_info->fuse_mountpoint, rel_path, NULL);
-    }
+    path = g_build_filename (mount_info->fuse_mountpoint, daemon_file->path, NULL);
   
   g_mount_info_unref (mount_info);
   
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- gvfs.spec	4 Aug 2009 15:48:09 -0000	1.140
+++ gvfs.spec	7 Aug 2009 13:23:00 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -43,6 +43,9 @@ Patch5: gvfs-1.2.3-sftp-40sec-timeout.pa
 # smb url don't work in the run application dialog 
 # http://bugzilla.gnome.org/show_bug.cgi?id=573994 
 Patch6: gvfs-1.3.4-smb-browse-fake-content-type.patch
+# Bad mount prefix stripping in g_daemon_file_get_path()
+# http://bugzilla.gnome.org/show_bug.cgi?id=590862
+Patch7: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -178,6 +181,7 @@ media players (Media Transfer Protocol) 
 %patch4 -p1 -b .cdda-query
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
+%patch7 -p1 -b .mount-prefix
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -343,6 +347,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-10
+- Fix bad mount prefix stripping (part of #509612)
+
 * Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-9
 - Fix SMB protocol not handled when opening from a bookmark (#509832)