[nautilus] Use GtkSpinner instead of custom widget

[Alexander Larsson <alexl src gnome org>]

commit d27a9a4260f76602a0c5e88706c1641e06515971
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Feb 22 12:43:59 2010 +0100

    Use GtkSpinner instead of custom widget
    
    Forgot this part of the commit...

 configure.in                     |    2 +-
 src/Makefile.am                  |    4 ---
 src/nautilus-navigation-window.c |    2 +-
 src/nautilus-notebook.c          |   20 ++++++-------
 src/nautilus-window-private.h    |   10 +++---
 src/nautilus-window-toolbars.c   |   55 ++++++++++---------------------------
 6 files changed, 31 insertions(+), 62 deletions(-)
---
diff --git a/configure.in b/configure.in
index e6dd337..8f08381 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl ===========================================================================
 m4_define(glib_minver,                 2.23.0)
 m4_define(gnome_desktop_minver,        2.29.4)
 m4_define(pango_minver,                1.1.2)
-m4_define(gtk_minver,                  2.16.0)
+m4_define(gtk_minver,                  2.19.0)
 m4_define(xml_minver,                  2.4.7)
 m4_define(exif_minver,                 0.5.12)
 m4_define(beagle_minver,               0.2.4)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f7b242..c72c4b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,8 +51,6 @@ schemedir = $(datadir)/applications
 scheme_DATA = network-scheme.desktop
 
 nautilus_SOURCES = \
-	ephy-spinner.h				\
-	ephy-spinner.c				\
 	nautilus-actions.h			\
 	nautilus-application.c			\
 	nautilus-application.h			\
@@ -116,8 +114,6 @@ nautilus_SOURCES = \
 	nautilus-sidebar-title.h		\
 	nautilus-spatial-window.c               \
 	nautilus-spatial-window.h               \
-	nautilus-throbber.c			\
-	nautilus-throbber.h			\
 	nautilus-trash-bar.c			\
 	nautilus-trash-bar.h			\
 	nautilus-view-as-action.c		\
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 2d5700a..6b85de5 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -760,7 +760,7 @@ real_sync_allow_stop (NautilusWindow *window,
 	NautilusNotebook *notebook;
 
 	navigation_window = NAUTILUS_NAVIGATION_WINDOW (window);
-	nautilus_navigation_window_set_throbber_active (navigation_window, slot->allow_stop);
+	nautilus_navigation_window_set_spinner_active (navigation_window, slot->allow_stop);
 
 	notebook = NAUTILUS_NOTEBOOK (NAUTILUS_NAVIGATION_WINDOW_PANE (slot->pane)->notebook);
 	nautilus_notebook_sync_loading (notebook, slot);
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index afb4c90..d25da25 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -31,7 +31,6 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-private.h"
 #include "nautilus-window-slot.h"
-#include "ephy-spinner.h"
 #include "nautilus-navigation-window-pane.h"
 #include <libnautilus-private/nautilus-dnd.h>
 
@@ -265,6 +264,7 @@ nautilus_notebook_sync_loading (NautilusNotebook *notebook,
 				NautilusWindowSlot *slot)
 {
 	GtkWidget *tab_label, *spinner, *icon;
+	gboolean active;
 
 	g_return_if_fail (NAUTILUS_IS_NOTEBOOK (notebook));
 	g_return_if_fail (NAUTILUS_IS_WINDOW_SLOT (slot));
@@ -276,19 +276,18 @@ nautilus_notebook_sync_loading (NautilusNotebook *notebook,
 	icon = GTK_WIDGET (g_object_get_data (G_OBJECT (tab_label), "icon"));
 	g_return_if_fail (spinner != NULL && icon != NULL);
 
-	if (ephy_spinner_get_spinning (EPHY_SPINNER (spinner)) == slot->allow_stop) {
+	active = FALSE;
+	g_object_get (spinner, "active", &active, NULL);
+	if (active == slot->allow_stop)	{
 		return;
 	}
 
-	if (slot->allow_stop)
-	{
+	if (slot->allow_stop) {
 		gtk_widget_hide (icon);
 		gtk_widget_show (spinner);
-		ephy_spinner_start (EPHY_SPINNER (spinner));
-	}
-	else
-	{
-		ephy_spinner_stop (EPHY_SPINNER (spinner));
+		gtk_spinner_start (GTK_SPINNER (spinner));
+	} else {
+		gtk_spinner_stop (GTK_SPINNER (spinner));
 		gtk_widget_hide (spinner);
 		gtk_widget_show (icon);
 	}
@@ -349,8 +348,7 @@ build_tab_label (NautilusNotebook *nb, NautilusWindowSlot *slot)
 	gtk_widget_show (hbox);
 
 	/* setup load feedback */
-	spinner = ephy_spinner_new ();
-	ephy_spinner_set_size (EPHY_SPINNER (spinner), GTK_ICON_SIZE_MENU);
+	spinner = gtk_spinner_new ();
 	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
 
 	/* setup site icon, empty by default */
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index 941b8dd..addcbd7 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -105,9 +105,9 @@ struct _NautilusNavigationWindowDetails {
         guint extensions_toolbar_merge_id;
         GtkActionGroup *extensions_toolbar_action_group;
 
-	/* Throbber */
-        gboolean    throbber_active;
-        GtkWidget  *throbber;
+        /* spinner */
+        gboolean    spinner_active;
+        GtkWidget  *spinner;
 
         /* focus widget before the location bar has been shown temporarily */
         GtkWidget *last_focus_widget;
@@ -232,10 +232,10 @@ void               nautilus_navigation_window_remove_go_menu_callback    (Nautil
 void               nautilus_navigation_window_remove_go_menu_items       (NautilusNavigationWindow    *window);
 
 /* Navigation window toolbar */
-void               nautilus_navigation_window_activate_throbber                     (NautilusNavigationWindow    *window);
+void               nautilus_navigation_window_activate_spinner                     (NautilusNavigationWindow    *window);
 void               nautilus_navigation_window_initialize_toolbars                   (NautilusNavigationWindow    *window);
 void               nautilus_navigation_window_load_extension_toolbar_items          (NautilusNavigationWindow    *window);
-void               nautilus_navigation_window_set_throbber_active                   (NautilusNavigationWindow    *window, 
+void               nautilus_navigation_window_set_spinner_active                   (NautilusNavigationWindow    *window, 
                                                                                      gboolean                     active);
 void               nautilus_navigation_window_go_back                               (NautilusNavigationWindow    *window);
 void               nautilus_navigation_window_go_forward                            (NautilusNavigationWindow    *window);
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 8dccb65..6c75d30 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -33,7 +33,6 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-private.h"
 #include "nautilus-window.h"
-#include "nautilus-throbber.h"
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-string.h>
@@ -56,50 +55,29 @@
 #define TOOLBAR_PATH_EXTENSION_ACTIONS "/Toolbar/Extra Buttons Placeholder/Extension Actions"
 
 void
-nautilus_navigation_window_set_throbber_active (NautilusNavigationWindow *window, 
-						gboolean allow)
+nautilus_navigation_window_set_spinner_active (NautilusNavigationWindow *window,
+					       gboolean allow)
 {
-	if (( window->details->throbber_active &&  allow) ||
-	    (!window->details->throbber_active && !allow)) {
+	if (( window->details->spinner_active &&  allow) ||
+	    (!window->details->spinner_active && !allow)) {
 		return;
 	}
 
-	window->details->throbber_active = allow;
+	window->details->spinner_active = allow;
 	if (allow) {
-		nautilus_throbber_start (NAUTILUS_THROBBER (window->details->throbber));
+		gtk_spinner_start (GTK_SPINNER (window->details->spinner));
 	} else {
-		nautilus_throbber_stop (NAUTILUS_THROBBER (window->details->throbber));
+		gtk_spinner_stop (GTK_SPINNER (window->details->spinner));
 	}
 }
 
-static void
-toolbar_reconfigured_cb (GtkToolItem *item,
-			 NautilusThrobber *throbber)
-{
-	GtkToolbarStyle style;
-	GtkIconSize size;
-
-	style = gtk_tool_item_get_toolbar_style (item);
-
-	if (style == GTK_TOOLBAR_BOTH)
-	{
-		size = GTK_ICON_SIZE_DIALOG;
-	}
-	else
-	{
-		size = GTK_ICON_SIZE_LARGE_TOOLBAR;
-	}
-
-	nautilus_throbber_set_size (throbber, size);
-}
-
 void
-nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window)
+nautilus_navigation_window_activate_spinner (NautilusNavigationWindow *window)
 {
 	GtkToolItem *item;
-	GtkWidget *throbber;
+	GtkWidget *spinner;
 
-	if (window->details->throbber != NULL) {
+	if (window->details->spinner != NULL) {
 		return;
 	}
 
@@ -109,26 +87,23 @@ nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window)
 	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
 			    item, -1);
 
-	throbber = nautilus_throbber_new ();
-	gtk_widget_show (GTK_WIDGET (throbber));
+	spinner = gtk_spinner_new ();
+	gtk_widget_show (GTK_WIDGET (spinner));
 
 	item = gtk_tool_item_new ();
-	gtk_container_add (GTK_CONTAINER (item), throbber);
+	gtk_container_add (GTK_CONTAINER (item), spinner);
 	gtk_widget_show (GTK_WIDGET (item));
-	
-	g_signal_connect (item, "toolbar-reconfigured",
-			  G_CALLBACK (toolbar_reconfigured_cb), throbber);
 
 	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
 			    item, -1);
 
-	window->details->throbber = throbber;
+	window->details->spinner = spinner;
 }
 
 void
 nautilus_navigation_window_initialize_toolbars (NautilusNavigationWindow *window)
 {
-	nautilus_navigation_window_activate_throbber (window);
+	nautilus_navigation_window_activate_spinner (window);
 }