[emerillon] Replace cut-n-paste ephy_spinner with GTK+ spinner.

[Łukasz Jernaś <ljernas src gnome org>]

commit b0cb600eaf0164e80c7af058d9260e08ef597790
Author: Andreas Henriksson <andreas fatal se>
Date:   Fri Apr 9 13:40:53 2010 +0200

    Replace cut-n-paste ephy_spinner with GTK+ spinner.
    
    Bump required Gtk+ version to 2.20
    
    Signed-off-by: Å?ukasz JernaÅ? <deejay1 srem org>

 configure.ac             |    2 +-
 cut-paste/Makefile.am    |   11 +-
 cut-paste/ephy-spinner.c |  975 ----------------------------------------------
 cut-paste/ephy-spinner.h |   69 ----
 emerillon/Makefile.am    |    3 +-
 emerillon/window.c       |    9 +-
 6 files changed, 6 insertions(+), 1063 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 989b788..b3c23ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 ################
 GLIB_REQUIRED=2.12.0
 GTHREAD_REQUIRED=2.12.0
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.20.0
 GCONF_REQUIRED=2.5.90
 CHAMPLAIN_REQUIRED=0.4
 CHAMPLAIN_GTK_REQUIRED=0.4
diff --git a/cut-paste/Makefile.am b/cut-paste/Makefile.am
index 0079f44..4e9487f 100644
--- a/cut-paste/Makefile.am
+++ b/cut-paste/Makefile.am
@@ -1,13 +1,4 @@
-noinst_LTLIBRARIES = libephyspinner.la libempathycell.la
-
-libephyspinner_la_SOURCES = \
-	ephy-spinner.h \
-	ephy-spinner.c
-
-libephyspinner_la_CFLAGS = \
-	-I$(top_srcdir)/src	\
-	$(EMERILLON_CFLAGS)		\
-	$(WARN_CFLAGS)
+noinst_LTLIBRARIES = libempathycell.la
 
 libempathycell_la_SOURCES = \
 	empathy-cell-renderer-activatable.h \
diff --git a/emerillon/Makefile.am b/emerillon/Makefile.am
index 217fe8b..2854a60 100644
--- a/emerillon/Makefile.am
+++ b/emerillon/Makefile.am
@@ -15,8 +15,7 @@ INCLUDES =								\
 bin_PROGRAMS = emerillon
 
 emerillon_LDADD = \
-	$(EMERILLON_LIBS) \
-	$(top_builddir)/cut-paste/libephyspinner.la
+	$(EMERILLON_LIBS)
 
 emerillon_LDFLAGS = \
 	-export-dynamic
diff --git a/emerillon/window.c b/emerillon/window.c
index 82f74c6..b6f4d48 100644
--- a/emerillon/window.c
+++ b/emerillon/window.c
@@ -34,7 +34,6 @@
 #include <gtk/gtk.h>
 
 #include "config-keys.h"
-#include "../cut-paste/ephy-spinner.h"
 #include "sidebar.h"
 
 static GtkWidget *default_window = NULL;
@@ -261,9 +260,9 @@ state_changed_cb (GtkWidget *widget,
 
   g_object_get (self->priv->view, "state", &state, NULL);
   if (state == CHAMPLAIN_STATE_LOADING)
-    ephy_spinner_start (EPHY_SPINNER (self->priv->throbber));
+    gtk_spinner_start (GTK_SPINNER (self->priv->throbber));
   else
-    ephy_spinner_stop (EPHY_SPINNER (self->priv->throbber));
+    gtk_spinner_stop (GTK_SPINNER (self->priv->throbber));
 }
 
 static void
@@ -731,9 +730,7 @@ build_ui (EmerillonWindow *self)
   self->priv->toolbar = gtk_ui_manager_get_widget (self->priv->ui_manager,
       "/Toolbar");
 
-  self->priv->throbber = ephy_spinner_new ();
-  ephy_spinner_set_size (EPHY_SPINNER (self->priv->throbber),
-      GTK_ICON_SIZE_LARGE_TOOLBAR);
+  self->priv->throbber = gtk_spinner_new ();
 
   throbber = gtk_tool_item_new ();
   gtk_container_add (GTK_CONTAINER (throbber), self->priv->throbber);