Remove type guessing, instead just display mounts in /media and in ~/.

2008-02-25  Alexander Larsson  <alexl@redhat.com>

        * gunixmounts.c:
        (g_unix_mount_guess_should_display):
	Remove type guessing, instead just display
	mounts in /media and in ~/.

svn path=/trunk/; revision=6582

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 749792e4adf74e4cf4620b07a933ae9ec5c50e35..9e4557d3b976137786a730813279b81548bbc30c 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-25  Alexander Larsson  <alexl@redhat.com>
+
+        * gunixmounts.c:
+        (g_unix_mount_guess_should_display):
+       Remove type guessing, instead just display
+       mounts in /media and in ~/.
+
 2008-02-25  Alexander Larsson  <alexl@redhat.com>
 
         * glocalfile.c:

diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 222dc975225f10ba9ee0b996784c4f09ea852d0e..6f0ab0b69fc06968f52703d7872592d2e561586c 100644 (file)
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1866,25 +1866,27 @@ gboolean
 g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry)
 {
   GUnixMountType guessed_type;
+  const char *mount_path;
 
   /* Never display internal mountpoints */
   if (g_unix_mount_is_system_internal (mount_entry))
     return FALSE;
-
-  /* Only display things that look "removable" or
-     things in /media (which are generally user mountable) */
-  guessed_type = g_unix_mount_guess_type (mount_entry);
-  if (guessed_type == G_UNIX_MOUNT_TYPE_IPOD ||
-      guessed_type == G_UNIX_MOUNT_TYPE_CDROM ||
-      guessed_type == G_UNIX_MOUNT_TYPE_FLOPPY ||
-      guessed_type == G_UNIX_MOUNT_TYPE_ZIP ||
-      guessed_type == G_UNIX_MOUNT_TYPE_JAZ ||
-      guessed_type == G_UNIX_MOUNT_TYPE_CAMERA ||
-      guessed_type == G_UNIX_MOUNT_TYPE_MEMSTICK ||
-      (mount_entry->mount_path != NULL &&
-       g_str_has_prefix (mount_entry->mount_path, "/media")))
-    return TRUE;
-
+  
+  /* Only display things in /media (which are generally user mountable)
+     and home dir (fuse stuff) */
+  mount_path = mount_entry->mount_path;
+  if (mount_path != NULL)
+    {
+      if (strstr (mount_path, "/.gvfs") != NULL)
+        return TRUE;
+      
+      if (g_str_has_prefix (mount_path, "/media/"))
+        return TRUE;
+      
+      if (g_str_has_prefix (mount_path, g_get_home_dir ()))
+        return TRUE;
+    }
+  
   return FALSE;
 }