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

[pborelli svn gnome org]

Author: pborelli
Date: Fri May  2 10:38:23 2008
New Revision: 7900
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=7900&view=rev

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

	* src/baobab.c:
	* src/baobab.h:
	* src/callbacks.c:
	Make the cursor busy in the set_busy function.



Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/src/baobab.c
   trunk/baobab/src/baobab.h
   trunk/baobab/src/callbacks.c

Modified: trunk/baobab/src/baobab.c
==============================================================================
--- trunk/baobab/src/baobab.c	(original)
+++ trunk/baobab/src/baobab.c	Fri May  2 10:38:23 2008
@@ -78,9 +78,17 @@
 }
 
 void
-set_busy (gboolean busy)
+baobab_set_busy (gboolean busy)
 {
+	static GdkCursor *busy_cursor = NULL;
+	GdkCursor *cursor = NULL;
+
 	if (busy == TRUE) {
+		if (!busy_cursor) {
+			busy_cursor = gdk_cursor_new (GDK_WATCH);
+		}
+		cursor = busy_cursor;
+
 		gedit_spinner_start (GEDIT_SPINNER (baobab.spinner));
  		baobab_ringschart_freeze_updates (baobab.ringschart);
 		baobab_ringschart_set_init_depth (baobab.ringschart, 0);
@@ -89,6 +97,11 @@
 		gedit_spinner_stop (GEDIT_SPINNER (baobab.spinner));
  		baobab_ringschart_thaw_updates (baobab.ringschart);
 	}
+
+	/* change the cursor */
+	if (baobab.window->window) {
+		gdk_window_set_cursor (baobab.window->window, cursor);
+	}
 }
 
 void
@@ -111,7 +124,7 @@
 	dir = g_file_get_uri (file);
 	g_noactivescans = FALSE; 
 	baobab.STOP_SCANNING = FALSE;
-	set_busy (TRUE);
+	baobab_set_busy (TRUE);
 	check_menu_sens (TRUE);
 	gtk_tree_store_clear (baobab.model);
 	currentdepth = -1;	/* flag */
@@ -132,28 +145,15 @@
 
 	getDir (dir);
 
-	/* change the cursor */
-	if (baobab.window->window) {
-		cursor = gdk_cursor_new (GDK_WATCH);
-		gdk_window_set_cursor (baobab.window->window, cursor);
-	}
-
 	/* set statusbar, percentage and allocated/normal size */
 	set_statusbar (_("Calculating percentage bars..."));
 	gtk_tree_model_foreach (GTK_TREE_MODEL (baobab.model),
 				show_bars,
 				NULL);
-	set_busy (FALSE);
+	baobab_set_busy (FALSE);
 	check_menu_sens (FALSE);
 	set_statusbar (_("Ready"));
 
-	/* cursor clean up */
-	if (baobab.window->window) {
-		gdk_window_set_cursor (baobab.window->window, NULL);
-		if (cursor)
-			gdk_cursor_unref (cursor);
-	}
-
 	gtk_tree_view_columns_autosize (GTK_TREE_VIEW (baobab.tree_view));
 	baobab.STOP_SCANNING = TRUE;
 	g_queue_free (iterstack);
@@ -204,7 +204,7 @@
 				show_bars, NULL);
 	gtk_tree_view_columns_autosize (GTK_TREE_VIEW (baobab.tree_view));
 
-	set_busy (FALSE);
+	baobab_set_busy (FALSE);
 	check_menu_sens (FALSE);
 	set_statusbar (_("Ready"));
 }
@@ -435,7 +435,6 @@
 	g_free (escaped_str);
 }
 
-
 void
 baobab_set_excluded_locations (GSList *excluded_uris)
 {
@@ -448,20 +447,21 @@
 		baobab.excluded_locations = g_slist_prepend (baobab.excluded_locations,
 						g_file_new_for_uri (l->data));
 	}
-
 }
 
 gboolean
 baobab_is_excluded_location (GFile *file)
 {
 	gboolean ret = FALSE;
-	GSList	*l;
-	
+	GSList *l;
+
+	g_return_val_if_fail (file != NULL, FALSE);
+
 	for (l=baobab.excluded_locations; l != NULL; l = l->next) {	
 		if (g_file_equal(l->data, file))
 			ret = TRUE;
 	}
-	
+
 	return ret;
 }
 
@@ -472,15 +472,14 @@
 	GFile	*file;
 
 	g_return_val_if_fail (uri != NULL, FALSE);
+
 	file = g_file_new_for_uri (uri);
 	ret = baobab_is_excluded_location (file);
 	g_object_unref (file);
+
 	return ret;
 }
 
-
-
-
 void
 set_toolbar_visible (gboolean visible)
 {

Modified: trunk/baobab/src/baobab.h
==============================================================================
--- trunk/baobab/src/baobab.h	(original)
+++ trunk/baobab/src/baobab.h	Fri May  2 10:38:23 2008
@@ -89,7 +89,7 @@
 baobab_application baobab;
 baobab_fs g_fs;
 
-void set_busy (gboolean busy);
+void baobab_set_busy (gboolean busy);
 void baobab_scan_location (GFile *);
 void baobab_scan_home (void);
 void baobab_scan_root (void);

Modified: trunk/baobab/src/callbacks.c
==============================================================================
--- trunk/baobab/src/callbacks.c	(original)
+++ trunk/baobab/src/callbacks.c	Fri May  2 10:38:23 2008
@@ -326,35 +326,20 @@
 on_ck_allocated_activate (GtkCheckMenuItem *checkmenuitem,
 			  gpointer user_data)
 {
-	GdkCursor *cursor = NULL;
-
 	if (!baobab.is_local)
 		return;
 
 	baobab.show_allocated = gtk_check_menu_item_get_active (checkmenuitem);
 
-	/* change the cursor */
-	if (baobab.window->window) {
-		cursor = gdk_cursor_new (GDK_WATCH);
-		gdk_window_set_cursor (baobab.window->window, cursor);
-	}
-
 	baobab_treeview_show_allocated_size (baobab.tree_view,
 					     baobab.show_allocated);
 
-	set_busy (TRUE);
+	baobab_set_busy (TRUE);
 	set_statusbar (_("Calculating percentage bars..."));
 	gtk_tree_model_foreach (GTK_TREE_MODEL (baobab.model),
 				show_bars, NULL);
-	set_busy (FALSE);
+	baobab_set_busy (FALSE);
 	set_statusbar (_("Ready"));
-
-	/* cursor clean up */
-	if (baobab.window->window) {
-		gdk_window_set_cursor (baobab.window->window, NULL);
-		if (cursor)
-			gdk_cursor_unref (cursor);
-	}
 }
 
 void