[network-manager-applet] Use GtkSpinner instead own code

[Javier Jardón <jjardon src gnome org>]

commit f08694328b4a9b2e5f60d9d6971dbe99bf81acd4
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Nov 17 03:14:58 2010 +0100

    Use GtkSpinner instead own code
    
    Only GTK+ 2.20 is required
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=635043

 configure.ac                    |    2 +-
 src/applet-dialogs.c            |   13 --
 src/gnome-bluetooth/bt-widget.c |    9 +-
 src/utils/Makefile.am           |    6 -
 src/utils/nma-bling-spinner.c   |  304 ---------------------------------------
 src/utils/nma-bling-spinner.h   |   58 --------
 6 files changed, 5 insertions(+), 387 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c96e381..504551d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ AC_ARG_WITH([gtk2], AS_HELP_STRING([--with-gtk2], [Use GTK+ 2.x instead of GTK+
             with_gtk2="$withval",with_gtk2=no)
 gtkver=3
 case "${with_gtk2}" in
-	yes)	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+	yes)	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20)
 		gtkver=2
 		;;
 	*)	PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.90)
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index 132cec2..c76f94a 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -44,7 +44,6 @@
 
 #include "applet-dialogs.h"
 #include "utils.h"
-#include "nma-bling-spinner.h"
 
 
 static void
@@ -1031,21 +1030,13 @@ applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text)
 	xml = g_object_get_data (G_OBJECT (dialog), "xml");
 	g_return_if_fail (xml != NULL);
 
-#if GTK_CHECK_VERSION(2,90,0)
 	spinner = gtk_spinner_new ();
-#else
-	spinner = nma_bling_spinner_new ();
-#endif
 	g_return_if_fail (spinner != NULL);
 	g_object_set_data (G_OBJECT (dialog), "spinner", spinner);
 
 	align = glade_xml_get_widget (xml, "spinner_alignment");
 	gtk_container_add (GTK_CONTAINER (align), spinner);
-#if GTK_CHECK_VERSION(2,90,0)
 	gtk_spinner_start (GTK_SPINNER (spinner));
-#else
-	nma_bling_spinner_start (NMA_BLING_SPINNER (spinner));
-#endif
 
 	widget = glade_xml_get_widget (xml, "progress_label");
 	gtk_label_set_text (GTK_LABEL (widget), text);
@@ -1083,11 +1074,7 @@ applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text)
 
 	spinner = g_object_get_data (G_OBJECT (dialog), "spinner");
 	g_return_if_fail (spinner != NULL);
-#if GTK_CHECK_VERSION(2,90,0)
 	gtk_spinner_stop (GTK_SPINNER (spinner));
-#else
-	nma_bling_spinner_stop (NMA_BLING_SPINNER (spinner));
-#endif
 	g_object_set_data (G_OBJECT (dialog), "spinner", NULL);
 
 	/* Remove it from the alignment */
diff --git a/src/gnome-bluetooth/bt-widget.c b/src/gnome-bluetooth/bt-widget.c
index b7b2d7f..380b80a 100644
--- a/src/gnome-bluetooth/bt-widget.c
+++ b/src/gnome-bluetooth/bt-widget.c
@@ -46,7 +46,6 @@
 #include <dbus/dbus-glib.h>
 
 #include "nma-marshal.h"
-#include "nma-bling-spinner.h"
 #include "mobile-wizard.h"
 
 #define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
@@ -301,7 +300,7 @@ dun_cleanup (PluginInfo *info, const char *message, gboolean uncheck)
 	}
 
 	if (info->spinner) {
-		nma_bling_spinner_stop (NMA_BLING_SPINNER (info->spinner));
+		gtk_spinner_stop (GTK_SPINNER (info->spinner));
 		gtk_widget_hide (info->spinner);
 	}
 	gtk_label_set_text (GTK_LABEL (info->label), message);
@@ -717,10 +716,10 @@ dun_start (PluginInfo *info)
 
 	/* Start the spinner */
 	if (!info->spinner) {
-		info->spinner = nma_bling_spinner_new ();
+		info->spinner = gtk_spinner_new ();
 		gtk_box_pack_start (GTK_BOX (info->hbox), info->spinner, FALSE, FALSE, 6);
 	}
-	nma_bling_spinner_start (NMA_BLING_SPINNER (info->spinner));
+	gtk_spinner_start (GTK_SPINNER (info->spinner))
 	gtk_widget_show_all (info->hbox);
 
 	gtk_widget_set_sensitive (info->dun_button, FALSE);
@@ -880,7 +879,7 @@ plugin_info_destroy (gpointer data)
 	if (info->dun_connection)
 		g_object_unref (info->dun_connection);
 	if (info->spinner)
-		nma_bling_spinner_stop (NMA_BLING_SPINNER (info->spinner));
+		gtk_spinner_stop (GTK_SPINNER (info->spinner));
 	g_object_unref (info->settings);
 	g_object_unref (info->btmodel);
 	g_object_unref (info->btclient);
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index d9a9c8e..d35bab7 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -10,12 +10,6 @@ libutils_la_SOURCES = \
 	mobile-wizard.h \
 	mobile-wizard.c
 
-if USE_GTK2
-libutils_la_SOURCES += \
-	nma-bling-spinner.h \
-	nma-bling-spinner.c
-endif
-
 libutils_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \