From 4a1cf45793e3e7ef5d94c10cd2331c6085423058 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 25 Feb 2008 11:15:06 +0000 Subject: [PATCH] Remove type guessing, instead just display mounts in /media and in ~/. 2008-02-25 Alexander Larsson * gunixmounts.c: (g_unix_mount_guess_should_display): Remove type guessing, instead just display mounts in /media and in ~/. svn path=/trunk/; revision=6582 --- gio/ChangeLog | 7 +++++++ gio/gunixmounts.c | 32 +++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 749792e..9e4557d 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,12 @@ 2008-02-25 Alexander Larsson + * gunixmounts.c: + (g_unix_mount_guess_should_display): + Remove type guessing, instead just display + mounts in /media and in ~/. + +2008-02-25 Alexander Larsson + * glocalfile.c: Make new strings reuse old ones. diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 222dc97..6f0ab0b 100644 --- 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; } -- 2.7.4