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

[pborelli svn gnome org]

Author: pborelli
Date: Fri May  2 13:16:11 2008
New Revision: 7903
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=7903&view=rev

Log:
2008-05-02  Paolo Borelli  <pborelli katamail com>

	* src/baobab-scan.c:
	* src/baobab-scan.h:
	* src/baobab.c:
	Rename getDir to baobab_scan_execute and make it take a GFile.



Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/src/baobab-scan.c
   trunk/baobab/src/baobab-scan.h
   trunk/baobab/src/baobab.c

Modified: trunk/baobab/src/baobab-scan.c
==============================================================================
--- trunk/baobab/src/baobab-scan.c	(original)
+++ trunk/baobab/src/baobab-scan.c	Fri May  2 13:16:11 2008
@@ -155,6 +155,15 @@
 	retloop.alloc_size = 0;
 	dir_uri = g_file_get_uri (file);
 	dir_path = g_file_get_path (file);
+
+	/* Skip the user excluded folders */
+	if (baobab_is_excluded_location (file))
+		goto exit;
+
+	/* Skip the virtual file systems */
+	if ((strcmp (dir_path, "/proc") == 0) ||
+            (strcmp (dir_path, "/sys") == 0))
+ 		goto exit;
  
 	dir_info = g_file_query_info (file, dir_attributes,
 				      G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
@@ -167,16 +176,6 @@
 		goto exit;
 	}
 
-	/* Skip the virtual file systems */
-	if ((strcmp (dir_path, "/proc") == 0) ||
-            (strcmp (dir_path, "/sys") == 0))
- 		goto exit;
-
-
-	/* Skip the user excluded folders */
-	if (baobab_is_excluded_location (file))
-		goto exit;
-
 	string_to_display = g_file_get_parse_name (file);	
 	
 	/* Folders we can't access (e.g perms 644). Skip'em. */
@@ -205,7 +204,6 @@
 		goto exit;
 	}
 
-
 	/* All skipped folders (i.e. bad type, excluded, /proc) must be
 	   skept *before* this point. Everything passes the prefill-model
 	   will be part of the GUI. */
@@ -296,22 +294,16 @@
 }
 
 void
-getDir (const gchar *uri_dir)
+baobab_scan_execute (GFile *location)
 {
 	BaobabHardLinkArray *hla;
-	GFile *file;
-	
-	file = g_file_new_for_uri (uri_dir);
-	
-	if (baobab_is_excluded_location (file)) {
-		g_object_unref (file);
-		return;
-		}
+
+	g_return_if_fail (location != NULL);
 
 	hla = baobab_hardlinks_array_create ();
 
-	loopdir (file, 0, hla);
+	loopdir (location, 0, hla);
 
 	baobab_hardlinks_array_free (hla);
-	g_object_unref (file);
 }
+

Modified: trunk/baobab/src/baobab-scan.h
==============================================================================
--- trunk/baobab/src/baobab-scan.h	(original)
+++ trunk/baobab/src/baobab-scan.h	Fri May  2 13:16:11 2008
@@ -20,14 +20,11 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __BBTHREAD_H__
-#define __BBTHREAD_H__
+#ifndef __BAOBAB_SCAN_H__
+#define __BAOBAB_SCAN_H__
 
-#include <glib/gtypes.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <sys/types.h>
+#include <gio/gio.h>
 
-void getDir (const gchar *);
-void searchDir (const gchar *, const gchar *);
+void baobab_scan_execute (GFile *location);
 
-#endif /* __BBTHREAD_H__ */
+#endif /* __BAOBAB_SCAN_H__ */

Modified: trunk/baobab/src/baobab.c
==============================================================================
--- trunk/baobab/src/baobab.c	(original)
+++ trunk/baobab/src/baobab.c	Fri May  2 13:16:11 2008
@@ -22,17 +22,12 @@
  
 #include <config.h>
 
-#include <pwd.h>
-#include <time.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glib/gprintf.h>
 #include <gio/gio.h>
 #include <libgnomeui/libgnomeui.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <gconf/gconf-client.h>
 #include <glibtop.h>
 
@@ -107,9 +102,7 @@
 void
 baobab_scan_location (GFile *file)
 {
-	GdkCursor *cursor = NULL;
 	GtkWidget *ck_allocated;
-	gchar *dir = NULL;
 
 	if (!baobab_check_dir (file))
 		return;
@@ -121,7 +114,6 @@
 		g_object_unref (current_location);
 	current_location = g_object_ref (file);
 
-	dir = g_file_get_uri (file);
 	g_noactivescans = FALSE; 
 	baobab.STOP_SCANNING = FALSE;
 	baobab_set_busy (TRUE);
@@ -134,8 +126,8 @@
 	baobab.is_local = scan_is_local (file);
 	ck_allocated = glade_xml_get_widget (baobab.main_xml, "ck_allocated");
 	if (!baobab.is_local) {
-		gtk_toggle_button_set_active ((GtkToggleButton *)
-					      ck_allocated, FALSE);
+		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (ck_allocated),
+						FALSE);
 		gtk_widget_set_sensitive (ck_allocated, FALSE);
 		baobab.show_allocated = FALSE;
 	}
@@ -143,7 +135,7 @@
 		gtk_widget_set_sensitive (ck_allocated, TRUE);
 	}
 
-	getDir (dir);
+	baobab_scan_execute (file);
 
 	/* set statusbar, percentage and allocated/normal size */
 	set_statusbar (_("Calculating percentage bars..."));
@@ -159,7 +151,6 @@
 	g_queue_free (iterstack);
 	iterstack = NULL;
 	baobab.CONTENTS_CHANGED_DELAYED = FALSE;
-	g_free (dir);
 }
 
 void