[gnome-bluetooth] Use the GTK+ spinner instead of our own

[Bastien Nocera <hadess src gnome org>]

commit 248b6b815ecdf9126b4665d525131ae38868e626
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 1 20:01:49 2009 +0000

    Use the GTK+ spinner instead of our own
    
    https://bugzilla.gnome.org/show_bug.cgi?id=598439

 configure.ac                |    2 +-
 lib/Makefile.am             |    2 -
 lib/bling-spinner.c         |  307 -------------------------------------------
 lib/bling-spinner.h         |   58 --------
 lib/bluetooth-chooser.c     |    9 +-
 lib/gnome-bluetooth.symbols |    1 -
 moblin/moblin-panel.c       |    7 +-
 wizard/main.c               |    9 +-
 8 files changed, 12 insertions(+), 383 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ec9b723..5d52cd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ if (test "$enable_icon_update" != no); then
 fi
 AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
-GTK_REQUIRED=2.15.0
+GTK_REQUIRED=2.19.1
 DBUS_GLIB_REQUIRED=0.74
 NOTIFY_REQUIRED=0.4.3
 NAUTILUS_SENDTO_REQUIRED=2.28.0.1
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7516b2c..9b155ab 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,7 +14,6 @@ libcommon_la_SOURCES =						\
 		obex-agent.h obex-agent.c			\
 		bluetooth-plugin-manager.c			\
 		bluetooth-plugin-manager.h			\
-		bling-spinner.c bling-spinner.h			\
 		bluetooth-enums.h				\
 		rfkill.h
 
@@ -28,7 +27,6 @@ libgnome_bluetooth_la_SOURCES =				\
 	marshal.h marshal.c				\
 	gnome-bluetooth-enum-types.h			\
 	gnome-bluetooth-enum-types.c			\
-	bling-spinner.c bling-spinner.h			\
 	bluetooth-chooser.c bluetooth-chooser.h		\
 	bluetooth-chooser-private.h			\
 	seahorse-bind.c seahorse-bind.h			\
diff --git a/lib/bluetooth-chooser.c b/lib/bluetooth-chooser.c
index 4903db0..addc93f 100644
--- a/lib/bluetooth-chooser.c
+++ b/lib/bluetooth-chooser.c
@@ -35,7 +35,6 @@
 #include "bluetooth-chooser.h"
 #include "bluetooth-chooser-private.h"
 #include "gnome-bluetooth-enum-types.h"
-#include "bling-spinner.h"
 #include "bluetooth-filter-widget.h"
 
 enum {
@@ -153,16 +152,16 @@ set_search_label (BluetoothChooser *self, gboolean state)
 
 	if (priv->show_searching == FALSE) {
 		/* Just making sure */
-		bling_spinner_stop (BLING_SPINNER (priv->spinner));
+		gtk_spinner_stop (GTK_SPINNER (priv->spinner));
 		return;
 	}
 	if (state == FALSE) {
-		bling_spinner_stop (BLING_SPINNER (priv->spinner));
+		gtk_spinner_stop (GTK_SPINNER (priv->spinner));
 		gtk_widget_hide (priv->spinner);
 		gtk_label_set_text (GTK_LABEL (priv->search_label), _("No adapters available"));
 	} else {
 		gtk_widget_show (priv->spinner);
-		bling_spinner_start (BLING_SPINNER (priv->spinner));
+		gtk_spinner_start (GTK_SPINNER (priv->spinner));
 		gtk_label_set_text (GTK_LABEL (priv->search_label), _("Searching for devices..."));
 	}
 }
@@ -834,7 +833,7 @@ bluetooth_chooser_init(BluetoothChooser *self)
 	/* The searching label */
 	priv->search_hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_set_no_show_all (priv->search_hbox, TRUE);
-	priv->spinner = bling_spinner_new ();
+	priv->spinner = gtk_spinner_new ();
 	gtk_container_add (GTK_CONTAINER (priv->search_hbox), priv->spinner);
 	gtk_widget_show (priv->spinner);
 	priv->search_label = gtk_label_new (_("Searching for devices..."));
diff --git a/lib/gnome-bluetooth.symbols b/lib/gnome-bluetooth.symbols
index 7a6f960..a5b1e9e 100644
--- a/lib/gnome-bluetooth.symbols
+++ b/lib/gnome-bluetooth.symbols
@@ -27,7 +27,6 @@ bluetooth_client_get_device_filter_model
 bluetooth_type_to_string
 bluetooth_verify_address
 bluetooth_uuid_to_string
-bling_spinner_get_type
 bluetooth_column_get_type
 bluetooth_category_get_type
 bluetooth_type_get_type
diff --git a/moblin/moblin-panel.c b/moblin/moblin-panel.c
index a023c83..875ee2f 100644
--- a/moblin/moblin-panel.c
+++ b/moblin/moblin-panel.c
@@ -43,7 +43,6 @@
 #include "bluetooth-filter-widget.h"
 #include "bluetooth-agent.h"
 #include "gnome-bluetooth-enum-types.h"
-#include "bling-spinner.h"
 
 #include "pin.h"
 
@@ -616,9 +615,9 @@ set_current_page (MoblinPanel *self, MoblinPages page)
 	}
 
 	if (page == PAGE_CONNECTING)
-		bling_spinner_start (BLING_SPINNER (priv->spinner));
+		gtk_spinner_start (GTK_SPINNER (priv->spinner));
 	else
-		bling_spinner_stop (BLING_SPINNER (priv->spinner));
+		gtk_spinner_stop (GTK_SPINNER (priv->spinner));
 
 	if ((page == PAGE_SETUP || page == PAGE_SSP_SETUP || page == PAGE_CONNECTING) && (priv->create_started == FALSE)) {
 		create_selected_device (self);
@@ -1415,7 +1414,7 @@ create_connecting_page (MoblinPanel *self)
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (page), vbox);
-	priv->spinner = bling_spinner_new ();
+	priv->spinner = gtk_spinner_new ();
 	gtk_widget_set_size_request (priv->spinner, 150, 150);
 	gtk_widget_show (priv->spinner);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->spinner, FALSE, FALSE, 6);
diff --git a/wizard/main.c b/wizard/main.c
index 74fdbde..07feed5 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -33,7 +33,6 @@
 #include <dbus/dbus-glib.h>
 #include <unique/uniqueapp.h>
 
-#include <bling-spinner.h>
 #include <bluetooth-client.h>
 #include <bluetooth-client-private.h>
 #include <bluetooth-chooser.h>
@@ -505,7 +504,7 @@ void prepare_callback (GtkWidget *assistant,
 
 		complete = FALSE;
 
-		bling_spinner_start (BLING_SPINNER (spinner_connecting));
+		gtk_spinner_start (GTK_SPINNER (spinner_connecting));
 
 		/* translators:
 		 * The '%s' is the device name, for example:
@@ -515,7 +514,7 @@ void prepare_callback (GtkWidget *assistant,
 		gtk_label_set_text (GTK_LABEL (label_connecting), text);
 		g_free (text);
 	} else {
-		bling_spinner_stop (BLING_SPINNER (spinner_connecting));
+		gtk_spinner_stop (GTK_SPINNER (spinner_connecting));
 	}
 
 	if ((page == page_setup || page == page_connecting) && (create_started == FALSE)) {
@@ -564,7 +563,7 @@ void prepare_callback (GtkWidget *assistant,
 
 		complete = FALSE;
 
-		bling_spinner_start (BLING_SPINNER (spinner_finishing));
+		gtk_spinner_start (GTK_SPINNER (spinner_finishing));
 
 		/* translators:
 		 * The '%s' is the device name, for example:
@@ -574,7 +573,7 @@ void prepare_callback (GtkWidget *assistant,
 		gtk_label_set_text (GTK_LABEL (label_finishing), text);
 		g_free (text);
 	} else {
-		bling_spinner_stop (BLING_SPINNER (spinner_finishing));
+		gtk_spinner_stop (GTK_SPINNER (spinner_finishing));
 	}
 
 	if (page == page_summary) {