Spinner changes

We get rid of the spinner in the toolbar, since load information is
already given by the floating status indicator inside the WebView.

The only remaining spinner is the one in the tabs, which has been
ported to use GtkSpinner.

Get rid of EphySpinner.

Fixes:
https://bugzilla.gnome.org/show_bug.cgi?id=524809 (again)
https://bugzilla.gnome.org/show_bug.cgi?id=598442

1 files changed, 0 insertions, 56 deletions

diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
index af1024928..9b47d8823 100644
--- a/src/ephy-fullscreen-popup.c
+++ b/src/ephy-fullscreen-popup.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include "ephy-fullscreen-popup.h"
-#include "ephy-spinner.h"
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
@@ -34,7 +33,6 @@ struct _EphyFullscreenPopupPrivate
 {
 	EphyWindow *window;
 	GtkWidget *frame;
-	EphySpinner *spinner;
 	GtkWidget *lock;
 	GtkWidget *lock_ebox;
 	GtkWidget *button;
@@ -93,26 +91,10 @@ ephy_fullscreen_popup_update_visibility (EphyFullscreenPopup *popup)
 	g_object_set (priv->button, "visible", priv->show_button,
 				    "sensitive", priv->show_button, NULL);
 	g_object_set (priv->frame, "visible", show_frame, NULL);
-	g_object_set (priv->spinner, "visible", priv->spinning, NULL);
 	g_object_set (priv->lock_ebox, "visible", priv->show_lock, NULL);
 }
 
 static void
-ephy_fullscreen_popup_update_spinner (EphyFullscreenPopup *popup)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-
-	if (priv->spinning && gtk_widget_get_visible (GTK_WIDGET (popup)))
-	{
-		ephy_spinner_start (priv->spinner);
-	}
-	else
-	{
-		ephy_spinner_stop (priv->spinner);
-	}
-}
-
-static void
 ephy_fullscreen_popup_update_position (EphyFullscreenPopup *popup)
 {
 	GtkWidget *widget = GTK_WIDGET (popup);
@@ -172,17 +154,6 @@ ephy_fullscreen_popup_set_show_leave (EphyFullscreenPopup *popup,
 }
 
 void
-ephy_fullscreen_popup_set_spinning (EphyFullscreenPopup *popup,
-				    gboolean spinning)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-
-	priv->spinning = spinning;
-	ephy_fullscreen_popup_update_visibility (popup);
-	ephy_fullscreen_popup_update_spinner (popup);
-}
-
-void
 ephy_fullscreen_popup_set_security_state (EphyFullscreenPopup *popup,
 					  gboolean show_lock,
 					  const char *stock,
@@ -244,11 +215,6 @@ ephy_fullscreen_popup_constructor (GType type,
 	gtk_container_add (GTK_CONTAINER (priv->frame), frame_hbox);
 	gtk_widget_show (frame_hbox);
 
-	/* add spinner */
-	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 */
 	priv->lock = gtk_image_new ();
 	gtk_widget_show (priv->lock);
@@ -321,26 +287,6 @@ ephy_fullscreen_popup_set_property (GObject *object,
 }
 
 static void
-ephy_fullscreen_popup_show (GtkWidget *widget)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (widget);
-
-	GTK_WIDGET_CLASS (ephy_fullscreen_popup_parent_class)->show (widget);
-
-	ephy_fullscreen_popup_update_spinner (popup);
-}
-
-static void
-ephy_fullscreen_popup_hide (GtkWidget *widget)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (widget);
-
-	GTK_WIDGET_CLASS (ephy_fullscreen_popup_parent_class)->hide (widget);
-
-	ephy_fullscreen_popup_update_spinner (popup);
-}
-
-static void
 ephy_fullscreen_popup_size_request (GtkWidget *widget,
 				    GtkRequisition *requisition)
 {
@@ -375,8 +321,6 @@ ephy_fullscreen_popup_class_init (EphyFullscreenPopupClass *klass)
 	object_class->get_property = ephy_fullscreen_popup_get_property;
 	object_class->set_property = ephy_fullscreen_popup_set_property;
 
-	widget_class->show = ephy_fullscreen_popup_show;
-	widget_class->hide = ephy_fullscreen_popup_hide;
 	widget_class->size_request = ephy_fullscreen_popup_size_request;
 	widget_class->realize = ephy_fullscreen_popup_realize;