Implement the data part of the toolbar editor. Partial implementation of

2003-01-24  Marco Pesenti Gritti  <marco@it.gnome.org>

	* NEWS:
	* configure.in:
	* data/ui/epiphany-toolbar.xml.in:
	* lib/egg/Makefile.am:
	* lib/widgets/Makefile.am:
	* lib/widgets/ephy-editable-toolbar.c:
	(ephy_editable_toolbar_get_type), (find_action),
	(add_action_to_list), (parse_item_list), (parse_toolbars),
	(load_defaults), (load_toolbar), (toolbar_list_to_xml),
	(toolbar_list_to_string), (do_merge),
	(ephy_editable_toolbar_set_merge),
	(ephy_editable_toolbar_set_property),
	(ephy_editable_toolbar_get_property),
	(ephy_editable_toolbar_class_init), (ephy_editable_toolbar_init),
	(ephy_editable_toolbar_save), (ephy_editable_toolbar_finalize),
	(ephy_editable_toolbar_new):
	* lib/widgets/ephy-editable-toolbar.h:
	* src/Makefile.am:
	* src/bookmarks/Makefile.am:
	* src/bookmarks/ephy-bookmark-action.c:
	(ephy_bookmark_action_get_type), (create_tool_item),
	(ephy_bookmark_action_sync_label), (connect_proxy),
	(ephy_bookmark_action_set_property),
	(ephy_bookmark_action_get_property),
	(ephy_bookmark_action_class_init), (ephy_bookmark_action_init),
	(ephy_bookmark_action_new):
	* src/bookmarks/ephy-bookmark-action.h:
	* src/ephy-tab.c: (ephy_tab_finalize), (ephy_tab_set_location):
	* src/toolbar.c: (toolbar_get_type), (toolbar_set_window),
	(editable_toolbar_request_action), (toolbar_init),
	(toolbar_finalize):
	* src/toolbar.h:

	Implement the data part of the toolbar editor.
	Partial implementation of Bookmark action.
	Try to fix crashes when switching tabs.

7 files changed, 306 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index bf4fdb8a2..81f3a02a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,7 @@ epiphany_SOURCES = 				    	\
 	ephy-location-action.h				\
 	ephy-main.c					\
 	ephy-navigation-action.c			\
+	ephy-navigation-action.h			\
 	ephy-shell.c					\
 	ephy-shell.h					\
 	ephy-spinner-action.c				\
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 098462cfa..24fa968da 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src		\
 	-I$(top_srcdir)/embed		\
 	-I$(top_srcdir)/lib/widgets	\
+	-I$(top_srcdir)/lib/egg		\
 	$(WARN_CFLAGS)			\
 	$(EPIPHANY_DEPENDENCY_CFLAGS) 	\
 	-DSHARE_DIR=\"$(pkgdatadir)\" 	\
@@ -17,6 +18,8 @@ INCLUDES = \
 noinst_LTLIBRARIES = libephybookmarks.la
 
 libephybookmarks_la_SOURCES = \
+	ephy-bookmark-action.c	\
+	ephy-bookmark-action.h	\
 	ephy-bookmarks.c	\
 	ephy-bookmarks.h	\
 	ephy-bookmarks-editor.c	\
@@ -31,5 +34,3 @@ libephybookmarks_la_SOURCES = \
 	ephy-node-view.h	\
 	ephy-tree-model-node.c	\
 	ephy-tree-model-node.h
-
-
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
new file mode 100644
index 000000000..8ce9e9f4c
--- /dev/null
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -0,0 +1,208 @@
+/*
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "ephy-bookmark-action.h"
+#include "ephy-bookmarks.h"
+#include "ephy-shell.h"
+#include "eggtoolitem.h"
+#include "ephy-debug.h"
+
+static void ephy_bookmark_action_init       (EphyBookmarkAction *action);
+static void ephy_bookmark_action_class_init (EphyBookmarkActionClass *class);
+
+struct EphyBookmarkActionPrivate
+{
+	int bookmark_id;
+};
+
+enum
+{
+	PROP_0,
+	PROP_BOOKMARK_ID
+};
+
+static GObjectClass *parent_class = NULL;
+
+GType
+ephy_bookmark_action_get_type (void)
+{
+	static GtkType type = 0;
+
+	if (!type)
+	{
+		static const GTypeInfo type_info =
+		{
+			sizeof (EphyBookmarkActionClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) ephy_bookmark_action_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,
+			sizeof (EphyBookmarkAction),
+			0, /* n_preallocs */
+			(GInstanceInitFunc) ephy_bookmark_action_init,
+		};
+
+		type = g_type_register_static (EGG_TYPE_ACTION,
+					       "EphyBookmarkAction",
+					       &type_info, 0);
+	}
+	return type;
+}
+
+static GtkWidget *
+create_tool_item (EggAction *action)
+{
+	GtkWidget *item;
+	GtkWidget *button;
+	GtkWidget *hbox;
+	GtkWidget *label;
+
+	item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action);
+
+	button = gtk_button_new ();
+	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+	gtk_widget_show (button);
+
+	hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (hbox);
+	gtk_container_add (GTK_CONTAINER (button), hbox);
+
+	label = gtk_label_new (NULL);
+	gtk_widget_show (label);
+	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+
+	gtk_container_add (GTK_CONTAINER (item), button);
+	g_object_set_data (G_OBJECT (item), "button", label);
+
+	return item;
+}
+
+static void
+ephy_bookmark_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+{
+	GtkLabel *label;
+
+	LOG ("Set bookmark action proxy label to %s", action->label)
+
+	label = GTK_LABEL (g_object_get_data (G_OBJECT (proxy), "button"));
+	g_return_if_fail (label != NULL);
+
+	gtk_label_set_label (label, action->label);
+}
+
+static void
+connect_proxy (EggAction *action, GtkWidget *proxy)
+{
+      (* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+
+      ephy_bookmark_action_sync_label (action, NULL, proxy);
+      g_signal_connect_object (action, "notify::label",
+			       G_CALLBACK (ephy_bookmark_action_sync_label), proxy, 0);
+}
+
+static void
+ephy_bookmark_action_set_property (GObject *object,
+                                   guint prop_id,
+                                   const GValue *value,
+                                   GParamSpec *pspec)
+{
+	EphyBookmarkAction *bmk;
+
+	bmk = EPHY_BOOKMARK_ACTION (object);
+
+	switch (prop_id)
+	{
+		case PROP_BOOKMARK_ID:
+			bmk->priv->bookmark_id = g_value_get_int (value);
+			break;
+	}
+}
+
+static void
+ephy_bookmark_action_get_property (GObject *object,
+                                   guint prop_id,
+                                   GValue *value,
+                                   GParamSpec *pspec)
+{
+	EphyBookmarkAction *bmk;
+
+	bmk = EPHY_BOOKMARK_ACTION (object);
+
+	switch (prop_id)
+	{
+		case PROP_BOOKMARK_ID:
+			g_value_set_boolean (value, bmk->priv->bookmark_id);
+			break;
+	}
+}
+
+static void
+ephy_bookmark_action_class_init (EphyBookmarkActionClass *class)
+{
+	EggActionClass *action_class;
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+	parent_class = g_type_class_peek_parent (class);
+	action_class = EGG_ACTION_CLASS (class);
+
+	action_class->toolbar_item_type = EGG_TYPE_TOOL_ITEM;
+	action_class->create_tool_item = create_tool_item;
+	action_class->connect_proxy = connect_proxy;
+
+	object_class->set_property = ephy_bookmark_action_set_property;
+	object_class->get_property = ephy_bookmark_action_get_property;
+
+	g_object_class_install_property (object_class,
+                                         PROP_BOOKMARK_ID,
+                                         g_param_spec_int ("bookmark_id",
+                                                           "bookmark_id",
+                                                           "bookmark_id",
+							   0,
+							   G_MAXINT,
+                                                           0,
+                                                           G_PARAM_READWRITE));
+}
+
+static void
+ephy_bookmark_action_init (EphyBookmarkAction *action)
+{
+	action->priv = g_new0 (EphyBookmarkActionPrivate, 1);
+}
+
+EggAction *
+ephy_bookmark_action_new (const char *name, guint id)
+{
+	EphyNode *bmk;
+	const char *title;
+	EphyBookmarks *bookmarks;
+
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+
+	bmk = ephy_node_get_from_id (id);
+	g_return_val_if_fail (bmk != NULL, NULL);
+
+	title = ephy_node_get_property_string
+		(bmk, EPHY_NODE_BMK_PROP_TITLE);
+
+	return EGG_ACTION (g_object_new (EPHY_TYPE_BOOKMARK_ACTION,
+					 "name", name,
+					 "label", title,
+					 NULL));
+}
+
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
new file mode 100644
index 000000000..ca67b0d0c
--- /dev/null
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef EPHY_BOOKMARK_ACTION_H
+#define EPHY_BOOKMARK_ACTION_H
+
+#include <gtk/gtk.h>
+#include <egg-action.h>
+
+#define EPHY_TYPE_BOOKMARK_ACTION            (ephy_bookmark_action_get_type ())
+#define EPHY_BOOKMARK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkAction))
+#define EPHY_BOOKMARK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkActionClass))
+#define EPHY_IS_BOOKMARK_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_BOOKMARK_ACTION))
+#define EPHY_IS_BOOKMARK_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_BOOKMARK_ACTION))
+#define EPHY_BOOKMARK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARK_ACTION, EphyBookmarkActionClass))
+
+typedef struct _EphyBookmarkAction      EphyBookmarkAction;
+typedef struct _EphyBookmarkActionClass EphyBookmarkActionClass;
+typedef struct EphyBookmarkActionPrivate EphyBookmarkActionPrivate;
+
+struct _EphyBookmarkAction
+{
+	EggAction parent;
+	EphyBookmarkActionPrivate *priv;
+};
+
+struct _EphyBookmarkActionClass
+{
+	EggActionClass parent_class;
+};
+
+GType      ephy_bookmark_action_get_type	(void);
+
+EggAction *ephy_bookmark_action_new		(const char *name,
+						 guint id);
+
+#endif
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 98f04fad1..9b3e53c5a 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -289,6 +289,8 @@ ephy_tab_finalize (GObject *object)
 		g_object_unref (tab->priv->event);
 	}
 
+	g_free (tab->priv->location);
+
         g_free (tab->priv);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -1001,10 +1003,10 @@ ephy_tab_get_favicon_url (EphyTab *tab)
 
 void
 ephy_tab_set_location (EphyTab *tab,
-			 char *location)
+		       char *location)
 {
 	if (tab->priv->location) g_free (tab->priv->location);
-	tab->priv->location = location;
+	tab->priv->location = g_strdup (location);
 }
 
 void
diff --git a/src/toolbar.c b/src/toolbar.c
index c97311fc8..7edc38490 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -28,9 +28,13 @@
 #include "ephy-location-action.h"
 #include "ephy-favicon-action.h"
 #include "ephy-navigation-action.h"
+#include "ephy-bookmark-action.h"
 #include "window-commands.h"
+#include "ephy-string.h"
 #include "ephy-debug.h"
 
+#include <string.h>
+
 static void toolbar_class_init (ToolbarClass *klass);
 static void toolbar_init (Toolbar *t);
 static void toolbar_finalize (GObject *object);
@@ -86,7 +90,7 @@ toolbar_get_type (void)
                         (GInstanceInitFunc) toolbar_init
                 };
 
-                toolbar_type = g_type_register_static (G_TYPE_OBJECT,
+                toolbar_type = g_type_register_static (EPHY_EDITABLE_TOOLBAR_TYPE,
 						       "Toolbar",
 						       &our_info, 0);
         }
@@ -149,14 +153,6 @@ toolbar_get_property (GObject *object,
 }
 
 static void
-toolbar_setup_widgets (Toolbar *t)
-{
-	egg_menu_merge_add_ui_from_file
-		(t->priv->ui_merge, ephy_file ("epiphany-toolbar.xml"), NULL);
-	egg_menu_merge_ensure_update (t->priv->ui_merge);
-}
-
-static void
 go_location_cb (EggAction *action, char *location, EphyWindow *window)
 {
 	EphyEmbed *embed;
@@ -243,7 +239,29 @@ toolbar_set_window (Toolbar *t, EphyWindow *window)
 	toolbar_setup_actions (t);
 	egg_menu_merge_insert_action_group (t->priv->ui_merge,
 					    t->priv->action_group, 1);
-	toolbar_setup_widgets (t);
+	g_object_set (t, "MenuMerge", t->priv->ui_merge, NULL);
+}
+
+static void
+editable_toolbar_request_action (Toolbar *t,
+				 const char *name,
+				 EphyEditableToolbar *etoolbar)
+{
+	guint id;
+
+	if (g_str_has_prefix (name, "GoBookmark") &&
+	    ephy_str_to_int (name + strlen ("GoBookmark"), &id))
+	{
+		EggAction *action;
+
+		LOG ("Create an action for bookmark %d", id)
+
+		action = ephy_bookmark_action_new (name, id);
+		g_signal_connect (action, "go_location",
+				  G_CALLBACK (go_location_cb), t->priv->window);
+		egg_action_group_add_action (t->priv->action_group, action);
+		g_object_unref (action);
+	}
 }
 
 static void
@@ -254,6 +272,10 @@ toolbar_init (Toolbar *t)
 	t->priv->window = NULL;
 	t->priv->ui_merge = NULL;
 	t->priv->visibility = TRUE;
+
+	g_signal_connect (t, "request_action",
+			  G_CALLBACK (editable_toolbar_request_action),
+			  EPHY_EDITABLE_TOOLBAR (t));
 }
 
 static void
@@ -272,14 +294,14 @@ toolbar_finalize (GObject *object)
 
         g_return_if_fail (p != NULL);
 
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+
 	g_object_unref (t->priv->action_group);
 	egg_menu_merge_remove_action_group (merge, t->priv->action_group);
 
         g_free (t->priv);
 
 	LOG ("Toolbar finalized")
-
-        G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 Toolbar *
diff --git a/src/toolbar.h b/src/toolbar.h
index 15cfa855a..649156165 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -19,7 +19,9 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
+#include "ephy-editable-toolbar.h"
 #include "ephy-window.h"
+
 #include <glib-object.h>
 #include <glib.h>
 
@@ -37,13 +39,13 @@ typedef struct ToolbarPrivate ToolbarPrivate;
 
 struct Toolbar
 {
-        GObject parent_object;
+        EphyEditableToolbar parent_object;
         ToolbarPrivate *priv;
 };
 
 struct ToolbarClass
 {
-        GObjectClass parent_class;
+        EphyEditableToolbarClass parent_class;
 };
 
 GType         toolbar_get_type			(void);