[gnome-utils] Port to GtkSpinner

[Paolo Borelli <pborelli src gnome org>]

commit 7dbc46cf8c2397203468d9bb110601e282826964
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Thu Jul 15 00:28:43 2010 +0200

    Port to GtkSpinner
    
    GNOME bug #612485

 baobab/src/Makefile.am     |    2 -
 baobab/src/baobab.c        |   20 +-
 baobab/src/gedit-spinner.c |  989 --------------------------------------------
 baobab/src/gedit-spinner.h |   95 -----
 configure.ac               |    2 +-
 5 files changed, 11 insertions(+), 1097 deletions(-)
---
diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index 12343cc..e8c6241 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -33,8 +33,6 @@ baobab_SOURCES = \
 	baobab-prefs.h \
 	baobab-remote-connect-dialog.c \
 	baobab-remote-connect-dialog.h \
-	gedit-spinner.c \
-	gedit-spinner.h \
 	baobab-chart.c \
 	baobab-chart.h \
 	baobab-treemap.c \
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 090dfff..7c799f3 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -35,8 +35,6 @@
 #include "callbacks.h"
 #include "baobab-prefs.h"
 
-#include "gedit-spinner.h"
-
 #include "baobab-treemap.h"
 #include "baobab-ringschart.h"
 
@@ -92,7 +90,8 @@ baobab_set_busy (gboolean busy)
 		}
 		cursor = busy_cursor;
 
-		gedit_spinner_start (GEDIT_SPINNER (baobab.spinner));
+		gtk_widget_show (baobab.spinner);
+		gtk_spinner_start (GTK_SPINNER (baobab.spinner));
 
 		baobab_chart_freeze_updates (baobab.rings_chart);
 
@@ -101,7 +100,8 @@ baobab_set_busy (gboolean busy)
 		gtk_widget_set_sensitive (baobab.chart_type_combo, FALSE);
 	}
 	else {
-		gedit_spinner_stop (GEDIT_SPINNER (baobab.spinner));
+		gtk_widget_hide (baobab.spinner);
+		gtk_spinner_stop (GTK_SPINNER (baobab.spinner));
 
 		baobab_chart_thaw_updates (baobab.rings_chart);
 		baobab_chart_thaw_updates (baobab.treemap_chart);
@@ -558,8 +558,8 @@ set_statusbar (const gchar *text)
 }
 
 static void
-toolbar_reconfigured_cb (GtkToolItem  *item,
-			 GeditSpinner *spinner)
+toolbar_reconfigured_cb (GtkToolItem *item,
+			 GtkWidget   *spinner)
 {
 	GtkToolbarStyle style;
 	GtkIconSize size;
@@ -575,7 +575,7 @@ toolbar_reconfigured_cb (GtkToolItem  *item,
 		size = GTK_ICON_SIZE_LARGE_TOOLBAR;
 	}
 
-	gedit_spinner_set_size (spinner, size);
+	gtk_widget_set_size_request (spinner, size, size);
 }
 
 static void
@@ -632,16 +632,16 @@ baobab_create_toolbar (void)
 	gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (separator));
 	gtk_widget_show (GTK_WIDGET (separator));
 
-	baobab.spinner = gedit_spinner_new ();
+	baobab.spinner = gtk_spinner_new ();
 	item = gtk_tool_item_new ();
 	gtk_container_add (GTK_CONTAINER (item), baobab.spinner);
 	gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (item));
-	gtk_widget_show (GTK_WIDGET (baobab.spinner));
 	gtk_widget_show (GTK_WIDGET (item));
 
 	g_signal_connect (item, "toolbar-reconfigured",
 			  G_CALLBACK (toolbar_reconfigured_cb), baobab.spinner);
-	toolbar_reconfigured_cb (item, GEDIT_SPINNER (baobab.spinner));
+	toolbar_reconfigured_cb (item, baobab.spinner);
+
 	baobab_toolbar_style (NULL, 0, NULL, NULL);
 
 	visible = gconf_client_get_bool (baobab.gconf_client,
diff --git a/configure.ac b/configure.ac
index e2a98b0..a25507c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ dnl pkg-config check
 
 GLIB_REQUIRED=2.20.0
 GIO_REQUIRED=2.16.0
-GTK_REQUIRED=2.18.0
+GTK_REQUIRED=2.20.0
 GIO_UNIX_REQUIRED=2.18.0
 LIBPANEL_APPLET_REQUIRED=2.13.4
 LIBGTOP_REQUIRED=2.12.0