Don't show not user visible mounts

2007-10-26  Alexander Larsson  <alexl@redhat.com>

        * client/gdaemonvolumemonitor.c:
	Don't show not user visible mounts

        * daemon/mount.c:
	Don't give fuse mounts for non visible mounts
	(as they don't get mounted)
	
        * daemon/gvfsbackendsmbbrowse.c:
        * daemon/gvfsbackendtrash.c:
	Mark as not user visible


svn path=/trunk/; revision=997

1 files changed, 16 insertions, 5 deletions

diff --git a/client/gdaemonvolumemonitor.c b/client/gdaemonvolumemonitor.c
index 48cfcb7c..c08231de 100644
--- a/client/gdaemonvolumemonitor.c
+++ b/client/gdaemonvolumemonitor.c
@@ -72,9 +72,13 @@ mount_added (GDaemonVolumeMonitor *daemon_monitor, GMountInfo *mount_info)
       return;
     }
 
-  volume = g_daemon_volume_new (G_VOLUME_MONITOR (daemon_monitor), g_mount_info_dup (mount_info));
-  daemon_monitor->volumes = g_list_prepend (daemon_monitor->volumes, volume);
-  g_signal_emit_by_name (daemon_monitor, "volume_mounted", volume);
+
+  if (mount_info->user_visible)
+    {
+      volume = g_daemon_volume_new (G_VOLUME_MONITOR (daemon_monitor), g_mount_info_dup (mount_info));
+      daemon_monitor->volumes = g_list_prepend (daemon_monitor->volumes, volume);
+      g_signal_emit_by_name (daemon_monitor, "volume_mounted", volume);
+    }
 }
 
 static void
@@ -99,6 +103,7 @@ g_daemon_volume_monitor_init (GDaemonVolumeMonitor *daemon_monitor)
 {
   GList *mounts, *l;
   GDaemonVolume *volume;
+  GMountInfo *info;
   
   daemon_monitor->mount_tracker = g_mount_tracker_new (_g_daemon_vfs_get_async_bus ());
 
@@ -111,8 +116,14 @@ g_daemon_volume_monitor_init (GDaemonVolumeMonitor *daemon_monitor)
   mounts = g_mount_tracker_list_mounts (daemon_monitor->mount_tracker);
 
   for (l = mounts; l != NULL; l = l->next) {
-    volume = g_daemon_volume_new (G_VOLUME_MONITOR (daemon_monitor), l->data);
-    daemon_monitor->volumes = g_list_prepend (daemon_monitor->volumes, volume);
+    info = l->data;
+    if (info->user_visible)
+      {
+	volume = g_daemon_volume_new (G_VOLUME_MONITOR (daemon_monitor), info);
+	daemon_monitor->volumes = g_list_prepend (daemon_monitor->volumes, volume);
+      }
+    else
+      g_mount_info_free (info);
   }
   
   g_list_free (mounts);