[Xfce4-commits] r26396 - in thunar/trunk: . thunar-vfs

[Benedikt Meurer]

Author: benny
Date: 2007-11-28 19:48:23 +0000 (Wed, 28 Nov 2007)
New Revision: 26396

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c
Log:
2007-11-28	Benedikt Meurer <benny at xfce.org>

	* thunar-vfs/thunar-vfs-volume-hal.c: Ignore volumes that do
	  not mountable file systems. Bug #3555.




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2007-11-28 19:15:27 UTC (rev 26395)
+++ thunar/trunk/ChangeLog	2007-11-28 19:48:23 UTC (rev 26396)
@@ -1,5 +1,10 @@
 2007-11-28	Benedikt Meurer <benny at xfce.org>
 
+	* thunar-vfs/thunar-vfs-volume-hal.c: Ignore volumes that do
+	  not mountable file systems. Bug #3555.
+
+2007-11-28	Benedikt Meurer <benny at xfce.org>
+
 	* plugins/thunar-uca/thunar-uca-model.c: Properly recognize
 	  OGG files as audio files. Bug #3604.
 

Modified: thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c	2007-11-28 19:15:27 UTC (rev 26395)
+++ thunar/trunk/thunar-vfs/thunar-vfs-volume-hal.c	2007-11-28 19:48:23 UTC (rev 26396)
@@ -1007,7 +1007,9 @@
   hv = libhal_volume_from_udi (context, udi);
 
   /* HAL might want us to ignore this volume for some reason */
-  if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
+  if (G_UNLIKELY (hv != NULL
+        && (libhal_volume_should_ignore (hv)
+          || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
     {
       libhal_volume_free (hv);
       return;