*** empty log message ***

2 files changed, 341 insertions, 0 deletions

diff --git a/src/bookmarks/ephy-bookmarks-toolbar.c b/src/bookmarks/ephy-bookmarks-toolbar.c
new file mode 100644
index 000000000..ea716ca60
--- /dev/null
+++ b/src/bookmarks/ephy-bookmarks-toolbar.c
@@ -0,0 +1,283 @@
+/*
+ *  Copyright (C) 2002  Ricardo Fernández Pascual
+ *
+ *  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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ephy-bookmarks-toolbar.h"
+#include "ephy-bookmark-action.h"
+#include "ephy-gobject-misc.h"
+#include "egg-menu-merge.h"
+#include "ephy-shell.h"
+#include "ephy-debug.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <libxml/entities.h>
+
+/**
+ * Private data
+ */
+struct _EphyBookmarksToolbarPrivate
+{
+	EphyWindow *window;
+	EphyBookmarks *bookmarks;
+	EggActionGroup *action_group;
+	guint ui_id;
+};
+
+typedef struct
+{
+	EphyWindow *window;
+	const char *url;
+} FavoriteData;
+
+/**
+ * Private functions, only availble from this file
+ */
+static void	ephy_bookmarks_toolbar_class_init	  (EphyBookmarksToolbarClass *klass);
+static void	ephy_bookmarks_toolbar_init	  (EphyBookmarksToolbar *wrhm);
+static void	ephy_bookmarks_toolbar_finalize_impl (GObject *o);
+static void	ephy_bookmarks_toolbar_rebuild	  (EphyBookmarksToolbar *wrhm);
+static void     ephy_bookmarks_toolbar_set_property  (GObject *object,
+						   guint prop_id,
+						   const GValue *value,
+						   GParamSpec *pspec);
+static void	ephy_bookmarks_toolbar_get_property  (GObject *object,
+						   guint prop_id,
+						   GValue *value,
+						   GParamSpec *pspec);
+
+enum
+{
+	PROP_0,
+	PROP_EPHY_WINDOW
+};
+
+static gpointer g_object_class;
+
+/**
+ * EphyBookmarksToolbar object
+ */
+MAKE_GET_TYPE (ephy_bookmarks_toolbar,
+	       "EphyBookmarksToolbar", EphyBookmarksToolbar,
+	       ephy_bookmarks_toolbar_class_init, ephy_bookmarks_toolbar_init,
+	       G_TYPE_OBJECT);
+
+static void
+ephy_bookmarks_toolbar_class_init (EphyBookmarksToolbarClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	G_OBJECT_CLASS (klass)->finalize = ephy_bookmarks_toolbar_finalize_impl;
+	g_object_class = g_type_class_peek_parent (klass);
+
+	object_class->set_property = ephy_bookmarks_toolbar_set_property;
+	object_class->get_property = ephy_bookmarks_toolbar_get_property;
+
+	g_object_class_install_property (object_class,
+                                         PROP_EPHY_WINDOW,
+                                         g_param_spec_object ("EphyWindow",
+                                                              "EphyWindow",
+                                                              "Parent window",
+                                                              EPHY_WINDOW_TYPE,
+                                                              G_PARAM_READWRITE));
+}
+
+static void
+ephy_bookmarks_toolbar_init (EphyBookmarksToolbar *wrhm)
+{
+	EphyBookmarksToolbarPrivate *p = g_new0 (EphyBookmarksToolbarPrivate, 1);
+	wrhm->priv = p;
+
+	wrhm->priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+	wrhm->priv->ui_id = -1;
+	wrhm->priv->action_group = NULL;
+}
+
+static void
+ephy_bookmarks_toolbar_clean (EphyBookmarksToolbar *wrhm)
+{
+	EphyBookmarksToolbarPrivate *p = wrhm->priv;
+	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+
+	if (p->ui_id >= 0)
+	{
+		egg_menu_merge_remove_ui (merge, p->ui_id);
+		egg_menu_merge_ensure_update (merge);
+	}
+
+	if (p->action_group != NULL)
+	{
+		egg_menu_merge_remove_action_group (merge, p->action_group);
+		g_object_unref (p->action_group);
+	}
+}
+
+static void
+ephy_bookmarks_toolbar_finalize_impl (GObject *o)
+{
+	EphyBookmarksToolbar *wrhm = EPHY_BOOKMARKS_TOOLBAR (o);
+	EphyBookmarksToolbarPrivate *p = wrhm->priv;
+
+	if (p->action_group != NULL)
+	{
+		egg_menu_merge_remove_action_group
+			(EGG_MENU_MERGE (p->window->ui_merge),
+			 p->action_group);
+		g_object_unref (p->action_group);
+	}
+
+	g_free (p);
+
+	G_OBJECT_CLASS (g_object_class)->finalize (o);
+}
+
+static void
+ephy_bookmarks_toolbar_set_property (GObject *object,
+				  guint prop_id,
+				  const GValue *value,
+				  GParamSpec *pspec)
+{
+        EphyBookmarksToolbar *m = EPHY_BOOKMARKS_TOOLBAR (object);
+
+        switch (prop_id)
+        {
+                case PROP_EPHY_WINDOW:
+                        m->priv->window = g_value_get_object (value);
+			ephy_bookmarks_toolbar_rebuild (m);
+                        break;
+        }
+}
+
+static void
+ephy_bookmarks_toolbar_get_property (GObject *object,
+                                  guint prop_id,
+                                  GValue *value,
+                                  GParamSpec *pspec)
+{
+        EphyBookmarksToolbar *m = EPHY_BOOKMARKS_TOOLBAR (object);
+
+        switch (prop_id)
+        {
+                case PROP_EPHY_WINDOW:
+                        g_value_set_object (value, m->priv->window);
+                        break;
+        }
+}
+
+EphyBookmarksToolbar *
+ephy_bookmarks_toolbar_new (EphyWindow *window)
+{
+	EphyBookmarksToolbar *ret = g_object_new (EPHY_TYPE_BOOKMARKS_TOOLBAR,
+					       "EphyWindow", window,
+					       NULL);
+	return ret;
+}
+
+static void
+ephy_bookmarks_toolbar_rebuild (EphyBookmarksToolbar *wrhm)
+{
+	EphyBookmarksToolbarPrivate *p = wrhm->priv;
+	GString *xml;
+	gint i;
+	EphyNode *bms;
+	GPtrArray *children;
+	EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge);
+	GError *error = NULL;
+
+	LOG ("Rebuilding recent history menu")
+
+	ephy_bookmarks_toolbar_clean (wrhm);
+
+	bms = ephy_bookmarks_get_bookmarks (p->bookmarks);
+	children = ephy_node_get_children (bms);
+
+	xml = g_string_new (NULL);
+	g_string_append (xml, "<Root><dockitem name=\"BookmarksToolbar\">");
+
+	p->action_group = egg_action_group_new ("BookmarksToolbar");
+	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
+
+	for (i = 0; i < children->len; i++)
+	{
+		gulong id;
+		char *verb;
+		EphyNode *child;
+		EggAction *action;
+		gboolean in_toolbar;
+
+		child = g_ptr_array_index (children, i);
+
+		in_toolbar = ephy_node_get_property_boolean
+			(child, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR);
+		if (!in_toolbar) continue;
+
+		id = ephy_node_get_id (child);
+		verb = g_strdup_printf ("GoBookmark%ld", id);
+
+		action = ephy_bookmark_action_new (verb, id);
+		egg_action_group_add_action (p->action_group, action);
+		g_object_unref (action);
+
+		g_string_append (xml, "<toolitem name=\"");
+		g_string_append (xml, verb);
+		g_string_append (xml, "Menu");
+		g_string_append (xml, "\" verb=\"");
+		g_string_append (xml, verb);
+		g_string_append (xml, "\"/>\n");
+
+		g_free (verb);
+	}
+
+	ephy_node_thaw (bms);
+
+	g_string_append (xml, "</dockitem></Root>");
+
+	LOG ("Merging ui\n%s",xml->str);
+	p->ui_id = egg_menu_merge_add_ui_from_string
+		(merge, xml->str, -1, &error);
+
+	g_string_free (xml, TRUE);
+}
+
+void ephy_bookmarks_toolbar_update	(EphyBookmarksToolbar *wrhm)
+{
+	ephy_bookmarks_toolbar_rebuild (wrhm);
+}
+
+void
+ephy_bookmarks_toolbar_show (EphyBookmarksToolbar *wrhm)
+{
+	GtkWidget *widget;
+	EggMenuMerge *merge = EGG_MENU_MERGE (wrhm->priv->window->ui_merge);
+
+	widget = egg_menu_merge_get_widget (merge, "/BookmarksToolbar");
+	gtk_widget_show (widget);
+}
+
+void
+ephy_bookmarks_toolbar_hide (EphyBookmarksToolbar *wrhm)
+{
+	GtkWidget *widget;
+	EggMenuMerge *merge = EGG_MENU_MERGE (wrhm->priv->window->ui_merge);
+
+	widget = egg_menu_merge_get_widget (merge, "/BookmarksToolbar");
+	gtk_widget_hide (widget);
+}
diff --git a/src/bookmarks/ephy-bookmarks-toolbar.h b/src/bookmarks/ephy-bookmarks-toolbar.h
new file mode 100644
index 000000000..826a09e0d
--- /dev/null
+++ b/src/bookmarks/ephy-bookmarks-toolbar.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2002  Ricardo Fernández Pascual
+ *
+ *  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_BOOKMARKS_TOOLBAR_H
+#define EPHY_BOOKMARKS_TOOLBAR_H
+
+#include "ephy-window.h"
+
+typedef struct _EphyBookmarksToolbar EphyBookmarksToolbar;
+typedef struct _EphyBookmarksToolbarClass EphyBookmarksToolbarClass;
+typedef struct _EphyBookmarksToolbarPrivate EphyBookmarksToolbarPrivate;
+
+#define EPHY_TYPE_BOOKMARKS_TOOLBAR	(ephy_bookmarks_toolbar_get_type())
+#define EPHY_BOOKMARKS_TOOLBAR(object)	(G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbar))
+#define EPHY_BOOKMARKS_TOOLBAR_CLASS(klass)(G_TYPE_CHECK_CLASS_CAST((klass), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbarClass))
+#define EPHY_IS_BOOKMARKS_TOOLBAR(object)	(G_TYPE_CHECK_INSTANCE_TYPE((object), EPHY_TYPE_BOOKMARKS_TOOLBAR))
+#define EPHY_IS_BOOKMARKS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_BOOKMARKS_TOOLBAR))
+#define EPHY_BOOKMARKS_TOOLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARKS_TOOLBAR, EphyBookmarksToolbarClass))
+
+struct _EphyBookmarksToolbarClass
+{
+	GObjectClass parent_class;
+};
+
+struct _EphyBookmarksToolbar
+{
+	GObject parent_object;
+
+	EphyBookmarksToolbarPrivate *priv;
+};
+
+GType			ephy_bookmarks_toolbar_get_type		(void);
+
+EphyBookmarksToolbar   *ephy_bookmarks_toolbar_new		(EphyWindow *window);
+
+void		        ephy_bookmarks_toolbar_update		(EphyBookmarksToolbar *wrhm);
+
+void		        ephy_bookmarks_toolbar_show		(EphyBookmarksToolbar *wrhm);
+
+void		        ephy_bookmarks_toolbar_hide		(EphyBookmarksToolbar *wrhm);
+
+#endif
+