glib r6824 - branches/glib-2-16/gio

[sbacher svn gnome org]

Author: sbacher
Date: Fri Apr  4 08:33:42 2008
New Revision: 6824
URL: http://svn.gnome.org/viewvc/glib?rev=6824&view=rev

Log:
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)



Modified:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/gunixmounts.c

Modified: branches/glib-2-16/gio/gunixmounts.c
==============================================================================
--- branches/glib-2-16/gio/gunixmounts.c	(original)
+++ branches/glib-2-16/gio/gunixmounts.c	Fri Apr  4 08:33:42 2008
@@ -1877,13 +1877,10 @@
   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;
     }