diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ephy-fullscreen-popup.c | 11 | ||||
| -rw-r--r-- | src/ephy-notebook.c | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 50e0abfe1..479f5be7a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -285,7 +285,6 @@ 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 \ @@ -318,7 +317,6 @@ 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 af1024928..4ed7a8247 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,7 @@ struct _EphyFullscreenPopupPrivate { EphyWindow *window; GtkWidget *frame; - EphySpinner *spinner; + GtkWidget *spinner; GtkWidget *lock; GtkWidget *lock_ebox; GtkWidget *button; @@ -104,11 +103,12 @@ ephy_fullscreen_popup_update_spinner (EphyFullscreenPopup *popup) if (priv->spinning && gtk_widget_get_visible (GTK_WIDGET (popup))) { - ephy_spinner_start (priv->spinner); + gtk_spinner_start (GTK_SPINNER (priv->spinner)); } else { - ephy_spinner_stop (priv->spinner); + gtk_spinner_stop (GTK_SPINNER (priv->spinner)); + gtk_spinner_reset (GTK_SPINNER (priv->spinner)); } } @@ -245,8 +245,7 @@ ephy_fullscreen_popup_constructor (GType type, 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); + priv->spinner = gtk_spinner_new (); 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 23805d267..b9a2e240c 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -32,7 +32,6 @@ #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" @@ -515,11 +514,11 @@ sync_load_status (EphyWebView *view, GParamSpec *pspec, GtkWidget *proxy) { gtk_widget_hide (icon); gtk_widget_show (spinner); - ephy_spinner_start (EPHY_SPINNER (spinner)); + gtk_spinner_start (GTK_SPINNER (spinner)); } else { - ephy_spinner_stop (EPHY_SPINNER (spinner)); + gtk_spinner_stop (GTK_SPINNER (spinner)); gtk_widget_hide (spinner); gtk_widget_show (icon); } @@ -598,8 +597,7 @@ build_tab_label (EphyNotebook *nb, EphyEmbed *embed) gtk_widget_show (hbox); /* setup load feedback */ - spinner = ephy_spinner_new (); - ephy_spinner_set_size (EPHY_SPINNER (spinner), GTK_ICON_SIZE_MENU); + spinner = gtk_spinner_new (); gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0); /* setup site icon, empty by default */ |