From 2ca51b4db7d1df89873cfd79875e7f69625cf867 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@gnome.org>
Date: Sun, 10 Oct 2010 22:46:25 +0900
Subject: Revert "Port to GtkSpinner"

This reverts commit 98811918bc8c5065eb4b21feb35c9f4def67341f.

Accidentally committed.
---
 src/Makefile.am             |  2 ++
 src/ephy-fullscreen-popup.c | 11 ++++++-----
 src/ephy-notebook.c         |  8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 479f5be7a..50e0abfe1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -285,6 +285,7 @@ EPHY_GIR_H_FILES = \
 	$(top_srcdir)/lib/egg/egg-editable-toolbar.h \
 	$(top_srcdir)/lib/egg/egg-toolbars-model.h \
 	$(top_srcdir)/lib/widgets/ephy-search-entry.h \
+	$(top_srcdir)/lib/widgets/ephy-spinner.h \
 	$(top_srcdir)/src/bookmarks/ephy-bookmarks.h \
 	$(top_srcdir)/src/ephy-extension.h \
 	$(top_srcdir)/src/ephy-extensions-manager.h \
@@ -317,6 +318,7 @@ EPHY_GIR_C_FILES = \
 	$(top_srcdir)/lib/egg/egg-editable-toolbar.c \
 	$(top_srcdir)/lib/egg/egg-toolbars-model.c \
 	$(top_srcdir)/lib/widgets/ephy-search-entry.c \
+	$(top_srcdir)/lib/widgets/ephy-spinner.c \
 	$(top_srcdir)/src/bookmarks/ephy-bookmarks.c \
 	$(top_srcdir)/src/ephy-extension.c \
 	$(top_srcdir)/src/ephy-extensions-manager.c \
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
index 4ed7a8247..af1024928 100644
--- a/src/ephy-fullscreen-popup.c
+++ b/src/ephy-fullscreen-popup.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ephy-fullscreen-popup.h"
+#include "ephy-spinner.h"
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
@@ -33,7 +34,7 @@ struct _EphyFullscreenPopupPrivate
 {
 	EphyWindow *window;
 	GtkWidget *frame;
-	GtkWidget *spinner;
+	EphySpinner *spinner;
 	GtkWidget *lock;
 	GtkWidget *lock_ebox;
 	GtkWidget *button;
@@ -103,12 +104,11 @@ ephy_fullscreen_popup_update_spinner (EphyFullscreenPopup *popup)
 
 	if (priv->spinning && gtk_widget_get_visible (GTK_WIDGET (popup)))
 	{
-		gtk_spinner_start (GTK_SPINNER (priv->spinner));
+		ephy_spinner_start (priv->spinner);
 	}
 	else
 	{
-		gtk_spinner_stop (GTK_SPINNER (priv->spinner));
-		gtk_spinner_reset (GTK_SPINNER (priv->spinner));
+		ephy_spinner_stop (priv->spinner);
 	}
 }
 
@@ -245,7 +245,8 @@ ephy_fullscreen_popup_constructor (GType type,
 	gtk_widget_show (frame_hbox);
 
 	/* add spinner */
-	priv->spinner = gtk_spinner_new ();
+	priv->spinner = EPHY_SPINNER (ephy_spinner_new ());
+	ephy_spinner_set_size (EPHY_SPINNER (priv->spinner), GTK_ICON_SIZE_BUTTON);
 	gtk_box_pack_start (GTK_BOX (frame_hbox), GTK_WIDGET (priv->spinner), FALSE, FALSE, 0);
 
 	/* lock */
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index b9a2e240c..23805d267 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -32,6 +32,7 @@
 #include "ephy-embed-utils.h"
 #include "ephy-window.h"
 #include "ephy-shell.h"
+#include "ephy-spinner.h"
 #include "ephy-link.h"
 #include "ephy-debug.h"
 
@@ -514,11 +515,11 @@ sync_load_status (EphyWebView *view, GParamSpec *pspec, GtkWidget *proxy)
 	{
 		gtk_widget_hide (icon);
 		gtk_widget_show (spinner);
-		gtk_spinner_start (GTK_SPINNER (spinner));
+		ephy_spinner_start (EPHY_SPINNER (spinner));
 	}
 	else
 	{
-		gtk_spinner_stop (GTK_SPINNER (spinner));
+		ephy_spinner_stop (EPHY_SPINNER (spinner));
 		gtk_widget_hide (spinner);
 		gtk_widget_show (icon);
 	}
@@ -597,7 +598,8 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed)
 	gtk_widget_show (hbox);
 
 	/* setup load feedback */
-	spinner = gtk_spinner_new ();
+	spinner = ephy_spinner_new ();
+	ephy_spinner_set_size (EPHY_SPINNER (spinner), GTK_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
 
 	/* setup site icon, empty by default */
-- 
cgit v1.2.3