From 4d8e9ed180c6d1506905e14fcc9ba26a7c24db19 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Thu, 23 Oct 2003 12:52:52 +0000
Subject: Move the spinner in his own mini toolbar.
2003-10-23 Marco Pesenti Gritti <marco@gnome.org>
* data/ui/epiphany-toolbar.xml:
* lib/egg/egg-editable-toolbar.c: (get_toolbar_position),
(get_dock_nth), (get_toolbar_nth), (create_dock), (update_fixed),
(toolbar_added_cb), (toolbar_removed_cb),
(egg_editable_toolbar_construct), (egg_editable_toolbar_init),
(egg_editable_toolbar_finalize), (egg_editable_toolbar_show),
(egg_editable_toolbar_hide), (egg_editable_toolbar_set_fixed):
* lib/egg/egg-editable-toolbar.h:
* src/Makefile.am:
* src/toolbar.c: (toolbar_setup_actions), (toolbar_init),
(toolbar_spinner_start), (toolbar_spinner_stop):
Move the spinner in his own mini toolbar.
---
src/toolbar.c | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
(limited to 'src/toolbar.c')
diff --git a/src/toolbar.c b/src/toolbar.c
index 025938e34..bcb5a5611 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -29,7 +29,6 @@
#include "ephy-location-entry.h"
#include "ephy-dnd.h"
#include "ephy-spinner.h"
-#include "ephy-spinner-action.h"
#include "ephy-location-action.h"
#include "ephy-favicon-action.h"
#include "ephy-topic-action.h"
@@ -326,13 +325,6 @@ toolbar_setup_actions (Toolbar *t)
gtk_action_group_add_action (t->priv->action_group, action);
g_object_unref (action);
- action = g_object_new (EPHY_TYPE_SPINNER_ACTION,
- "name", "Spinner",
- "label", _("Spinner"),
- NULL);
- gtk_action_group_add_action (t->priv->action_group, action);
- g_object_unref (action);
-
/* FIXME: I'm still waiting for the exact term to
* user here from the docs team.
*/
@@ -539,6 +531,11 @@ toolbar_init (Toolbar *t)
t->priv->ui_merge = NULL;
t->priv->visibility = TRUE;
t->priv->updating_address = FALSE;
+
+ t->priv->spinner = ephy_spinner_new ();
+ gtk_widget_show (t->priv->spinner);
+ egg_editable_toolbar_set_fixed (EGG_EDITABLE_TOOLBAR (t),
+ t->priv->spinner);
}
static void
@@ -577,23 +574,11 @@ toolbar_activate_location (Toolbar *t)
void
toolbar_spinner_start (Toolbar *t)
{
- GtkActionGroup *action_group;
- GtkAction *action;
-
- action_group = t->priv->action_group;
- action = gtk_action_group_get_action (action_group, "Spinner");
- g_object_set (action, "throbbing", TRUE, NULL);
}
void
toolbar_spinner_stop (Toolbar *t)
{
- GtkActionGroup *action_group;
- GtkAction *action;
-
- action_group = t->priv->action_group;
- action = gtk_action_group_get_action (action_group, "Spinner");
- g_object_set (action, "throbbing", FALSE, NULL);
}
void
--
cgit