gvfs r1266 - in trunk: . hal

[alexl svn gnome org]

Author: alexl
Date: Wed Feb 13 13:10:35 2008
New Revision: 1266
URL: http://svn.gnome.org/viewvc/gvfs?rev=1266&view=rev

Log:
2008-02-13  Alexander Larsson  <alexl redhat com>

        * hal/ghalmount.c:
	Don't show nfs mounts (#516036)




Modified:
   trunk/ChangeLog
   trunk/hal/ghalmount.c

Modified: trunk/hal/ghalmount.c
==============================================================================
--- trunk/hal/ghalmount.c	(original)
+++ trunk/hal/ghalmount.c	Wed Feb 13 13:10:35 2008
@@ -614,6 +614,22 @@
   update_from_hal (mount, TRUE);
 }
 
+static gboolean
+should_ignore_non_hal (GUnixMountEntry *mount_entry)
+{
+  const char *fs_type;
+  
+  fs_type = g_unix_mount_get_fs_type (mount_entry);
+
+  /* We don't want to report nfs mounts. They are
+     generally internal things, and cause a lot
+     of pain with autofs and autorun */
+  if (strcmp (fs_type, "nfs") == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
 GHalMount *
 g_hal_mount_new (GVolumeMonitor       *volume_monitor,
                  GUnixMountEntry      *mount_entry,
@@ -624,8 +640,8 @@
   HalDevice *drive_device;
   const char *storage_udi;
   GHalMount *mount;
-  
-  /* No volume for mount: Ignore internal things */
+
+  /* If no volume for mount - Ignore internal things */
   if (volume == NULL && g_unix_mount_is_system_internal (mount_entry))
     return NULL;
 
@@ -676,6 +692,12 @@
 
  not_hal:
 
+  if (volume != NULL || should_ignore_non_hal (mount_entry))
+    {
+      g_object_unref (mount);
+      return NULL;
+    }
+  
   mount->name = g_unix_mount_guess_name (mount_entry);
   mount->icon = g_unix_mount_guess_icon (mount_entry);