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=/branches/glib-2-16/; revision=6824
This commit is contained in:
Sebastien Bacher
2008-04-04 07:33:42 +00:00
committed by Sebastien Bacher
parent ab526ed5da
commit 1916e11efb
2 changed files with 8 additions and 4 deletions

View File

@@ -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 Matthias Clasen <mclasen@redhat.com> 2008-03-31 Matthias Clasen <mclasen@redhat.com>
* === Released 2.16.2 === * === Released 2.16.2 ===

View File

@@ -1877,13 +1877,10 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry)
mount_path = mount_entry->mount_path; mount_path = mount_entry->mount_path;
if (mount_path != NULL) if (mount_path != NULL)
{ {
if (strstr (mount_path, "/.gvfs") != NULL)
return TRUE;
if (g_str_has_prefix (mount_path, "/media/")) if (g_str_has_prefix (mount_path, "/media/"))
return TRUE; 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; return TRUE;
} }