gnome-utils r8465 - in trunk/baobab: . src

[marzocca svn gnome org]

Author: marzocca
Date: Sun Mar  8 09:39:54 2009
New Revision: 8465
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8465&view=rev

Log:
Bug #574105

Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/src/baobab-prefs.c

Modified: trunk/baobab/src/baobab-prefs.c
==============================================================================
--- trunk/baobab/src/baobab-prefs.c	(original)
+++ trunk/baobab/src/baobab-prefs.c	Sun Mar  8 09:39:54 2009
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <string.h>
+#include <sys/stat.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
@@ -262,9 +263,7 @@
 	glibtop_mountlist mountlist;
 	glibtop_mountentry *mountentry, *mountentry_tofree;
 	guint64 fstotal, fsavail;
-	gchar	*dot_gvfs;
 	
-	dot_gvfs = g_build_filename (g_get_home_dir (), ".gvfs", NULL);
 	mountentry_tofree = glibtop_get_mountlist (&mountlist, 0);
 
 	for (lo = 0, mountentry = mountentry_tofree; lo < mountlist.number;
@@ -275,10 +274,9 @@
 		GFile	*file;
 		gchar	*uri;
 		
-		
-		/* FIXME: skip gvfs fuse mounts... see baobab-scan.c for details */
-		if (dot_gvfs != NULL && mountentry->mountdir != NULL && strcmp (dot_gvfs, mountentry->mountdir) == 0) 
-			continue;
+                struct stat buf;
+                if (g_stat(mountentry->devname,&buf) == -1)
+                  continue;		
 				
 		glibtop_get_fsusage (&fsusage, mountentry->mountdir);
 		fstotal = fsusage.blocks * fsusage.block_size;
@@ -303,7 +301,6 @@
 		g_object_unref(file);
 	}
 
-	g_free (dot_gvfs);
 	g_free (mountentry_tofree);
 }