Don't list the user directory as a mount, fix potential issue when other

2008-04-04  Sebastien Bacher  <seb128@ubuntu.com>

	* gunixmounts.c: (g_unix_mount_guess_should_display):
	Don't list the user directory as a mount, fix potential issue
	when other users have a similar naming and don't special case the
	gvfs mounts there since that's not required (#525866)

svn path=/trunk/; revision=6825

diff --git a/gio/ChangeLog b/gio/ChangeLog
index a25e61af4647b052f002892f0b7180de40fd871d..1d96b58dccbf569199346ab0dd1341c68929abd9 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-04  Sebastien Bacher  <seb128@ubuntu.com>
+
+       * gunixmounts.c: (g_unix_mount_guess_should_display):
+       Don't list the user directory as a mount, fix potential issue
+       when other users have a similar naming and don't special case the
+       gvfs mounts there since that's not required (#525866)
+
 2008-03-31  Alexander Larsson  <alexl@redhat.com>
 
        * glocalfile.c (get_parent):

diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index eadbf0941e03936812cbbbc312bcbbf08cd9203f..577338c8a22299d4559f565b38cc812b8b63285f 100644 (file)
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1887,13 +1887,10 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry)
   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 ()))
+      if (g_str_has_prefix (mount_path, g_get_home_dir ()) && mount_path[strlen (g_get_home_dir())] == G_DIR_SEPARATOR)
         return TRUE;
     }