[gedit] Use GtkSpinner instead of GeditSpinner with gtk+ >= 2.19.0

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 3edb6ad18e6943c9fd22fdaa3675b77cc3fac30a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Oct 29 17:41:25 2009 +0100

    Use GtkSpinner instead of GeditSpinner with gtk+ >= 2.19.0

 configure.ac           |   10 ++++++++++
 gedit/Makefile.am      |    7 +++++--
 gedit/gedit-notebook.c |   15 +++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eafe16d..42dcbab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,6 +261,16 @@ fi
 
 AM_CONDITIONAL(BUILD_MESSAGE_AREA, test "$gtkatleast" = "no")
 
+dnl FIXME: Remove this when removing gedit-spinner
+
+if $PKG_CONFIG --atleast-version 2.19.0 gtk+-2.0; then
+       gtkatleast=
+else
+       gtkatleast=no
+fi
+
+AM_CONDITIONAL(BUILD_SPINNER, test "$gtkatleast" = "no")
+
 if test "$platform_osx" = "no" &&
    test "$os_win32" = no; then
 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 35ea707..40f64f1 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -72,7 +72,6 @@ NOINST_H_FILES =			\
 	gedit-print-job.h		\
 	gedit-print-preview.h		\
 	gedit-io-error-message-area.h	\
-	gedit-spinner.h			\
 	gedit-prefs-manager-private.h	\
 	gedittextregion.h		\
 	gedit-session.h			\
@@ -166,7 +165,6 @@ libgedit_la_SOURCES = 			\
 	gedit-print-preview.c		\
 	gedit-progress-message-area.c	\
 	gedit-session.c			\
-	gedit-spinner.c			\
 	gedit-statusbar.c		\
 	gedit-status-combo-box.c	\
 	gedit-style-scheme-manager.c	\
@@ -232,4 +230,9 @@ libgedit_la_SOURCES += gedit-message-area.c
 INST_H_FILES += gedit-message-area.h
 endif
 
+if BUILD_SPINNER
+libgedit_la_SOURCES += gedit-spinner.c
+NOINST_H_FILES += gedit-spinner.h
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
index 74ac1ac..b0fc2fb 100644
--- a/gedit/gedit-notebook.c
+++ b/gedit/gedit-notebook.c
@@ -46,7 +46,10 @@
 #include "gedit-notebook.h"
 #include "gedit-marshal.h"
 #include "gedit-window.h"
+
+#ifdef BUILD_SPINNER
 #include "gedit-spinner.h"
+#endif
 
 #define AFTER_ALL_TABS -1
 #define NOT_IN_APP_WINDOWS -2
@@ -823,7 +826,11 @@ sync_name (GeditTab *tab, GParamSpec *pspec, GtkWidget *hbox)
 		gtk_widget_hide (GTK_WIDGET (icon));
 		
 		gtk_widget_show (spinner);
+#ifdef BUILD_SPINNER
 		gedit_spinner_start (GEDIT_SPINNER (spinner));
+#else
+		gtk_spinner_start (GTK_SPINNER (spinner));
+#endif
 	}
 	else
 	{
@@ -838,7 +845,11 @@ sync_name (GeditTab *tab, GParamSpec *pspec, GtkWidget *hbox)
 		gtk_widget_show (GTK_WIDGET (icon));
 		
 		gtk_widget_hide (spinner);
+#ifdef BUILD_SPINNER
 		gedit_spinner_stop (GEDIT_SPINNER (spinner));
+#else
+		gtk_spinner_stop (GTK_SPINNER (spinner));
+#endif
 	}
 }
 
@@ -908,8 +919,12 @@ build_tab_label (GeditNotebook *nb,
 			  tab);
 
 	/* setup spinner */
+#ifdef BUILD_SPINNER
 	spinner = gedit_spinner_new ();
 	gedit_spinner_set_size (GEDIT_SPINNER (spinner), GTK_ICON_SIZE_MENU);
+#else
+	spinner = gtk_spinner_new ();
+#endif
 	gtk_box_pack_start (GTK_BOX (label_hbox), spinner, FALSE, FALSE, 0);
 
 	/* setup site icon, empty by default */