r9529 - in /desktop/experimental/gnome-vfs2/debian: changelog patches/30_nfs4.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr  5 21:42:56 2007
New Revision: 9529

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9529
Log:
* 22_ignore_inaccessible_volumes.patch: patch from Ubuntu to ignore
* Update patch 30_nfs4 to also update the do_is_local() method; thanks
  John Goerzen; closes: #413993.

Modified:
    desktop/experimental/gnome-vfs2/debian/changelog
    desktop/experimental/gnome-vfs2/debian/patches/30_nfs4.patch

Modified: desktop/experimental/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/changelog?rev=9529&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/changelog (original)
+++ desktop/experimental/gnome-vfs2/debian/changelog Thu Apr  5 21:42:56 2007
@@ -1,10 +1,12 @@
 gnome-vfs2 (1:2.18.0.1-2) UNRELEASED; urgency=low
 
-  * 22_ignore_inaccessible_volumes.patch: patch from Ubuntu to ignore 
+  * 22_ignore_inaccessible_volumes.patch: patch from Ubuntu to ignore
     volumes on which the current user doesn't have permissions.
     Closes: #416692.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 30 Mar 2007 00:03:06 +0200
+  * Update patch 30_nfs4 to also update the do_is_local() method; thanks
+    John Goerzen; closes: #413993.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 05 Apr 2007 23:42:30 +0200
 
 gnome-vfs2 (1:2.18.0.1-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-vfs2/debian/patches/30_nfs4.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/30_nfs4.patch?rev=9529&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/30_nfs4.patch (original)
+++ desktop/experimental/gnome-vfs2/debian/patches/30_nfs4.patch Thu Apr  5 21:42:56 2007
@@ -1,6 +1,6 @@
 diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c
 --- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c	2005-07-18 14:29:56.000000000 +0200
-+++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c	2007-02-09 21:20:20.000000000 +0100
++++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c	2007-03-12 17:23:34.000000000 +0100
 @@ -57,6 +57,7 @@
  	{ "msdos"    , N_("MSDOS Volume"), 0 },
  	{ "msdosfs"  , N_("MSDOS Volume"), 0 },
@@ -10,8 +10,8 @@
  	{ "nwfs"     , N_("Netware Volume"), 0 },
  	{ "proc"     , N_("System Volume"), 0 },
 diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2007-02-09 21:19:37.000000000 +0100
-+++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2007-02-09 21:21:36.000000000 +0100
+--- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2007-03-12 17:23:33.000000000 +0100
++++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2007-03-12 17:23:34.000000000 +0100
 @@ -891,7 +891,8 @@
  		if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_UNKNOWN) {
  			vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_CDROM;
@@ -22,3 +22,14 @@
  		if (strstr (vol->priv->device_path, "(pid") != NULL) {
  			vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUTOFS;
  		} else {
+diff -Nur gnome-vfs2-2.14.2/modules/file-method.c gnome-vfs2-2.14.2.new/modules/file-method.c
+--- gnome-vfs2-2.14.2/modules/file-method.c	2007-03-12 17:23:33.000000000 +0100
++++ gnome-vfs2-2.14.2.new/modules/file-method.c	2007-03-12 17:24:44.000000000 +0100
+@@ -1154,6 +1154,7 @@
+ 		if (g_stat (path, &statbuf) == 0) {
+ 			char *type = filesystem_type (path, path, &statbuf);
+ 			gboolean is_local = ((strcmp (type, "nfs") != 0) && 
++					     (strcmp (type, "nfs4") != 0) &&
+ 					     (strcmp (type, "afs") != 0) &&
+ 					     (strcmp (type, "autofs") != 0) &&
+ 					     (strcmp (type, "unknown") != 0) &&