1 files changed, 219 insertions, 777 deletions

diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 4885d2af6..3e0607509 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -22,28 +22,27 @@
 #include "config.h"
 
 #include "ephy-topic-action.h"
+#include "ephy-node.h"
 #include "ephy-node-common.h"
+#include "ephy-nodes-cover.h"
 #include "ephy-bookmarks.h"
-#include "ephy-bookmarksbar.h"
-#include "ephy-link.h"
-#include "ephy-favicon-cache.h"
-#include "ephy-shell.h"
-#include "ephy-dnd.h"
+#include "ephy-bookmarks-ui.h"
+#include "ephy-bookmarks-menu.h"
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkarrow.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkimage.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkimagemenuitem.h>
 #include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkarrow.h>
 #include <gtk/gtkmain.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <string.h>
@@ -54,26 +53,18 @@
 
 #define EPHY_TOPIC_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionPrivate))
 
-static GtkTargetEntry drag_targets[] =
-{
-	{ EPHY_DND_TOPIC_TYPE, 0, 0 }
-};
-static int n_drag_targets = G_N_ELEMENTS (drag_targets);
-
 struct _EphyTopicActionPrivate
 {
-	EphyNode *topic_node;
-
-	guint motion_handler;
-	guint release_handler;
-	gint drag_x;
-	gint drag_y;
+	EphyNode *node;
+	GtkUIManager *manager;
+	guint merge_id;
 };
 
 enum
 {
 	PROP_0,
-	PROP_TOPIC
+	PROP_TOPIC,
+	PROP_MANAGER
 };
 
 static void ephy_topic_action_class_init (EphyTopicActionClass *class);
@@ -101,7 +92,7 @@ ephy_topic_action_get_type (void)
 			(GInstanceInitFunc) ephy_topic_action_init,
 		};
 
-		type = g_type_register_static (EPHY_TYPE_LINK_ACTION,
+		type = g_type_register_static (GTK_TYPE_ACTION,
 					       "EphyTopicAction",
 					       &type_info, 0);
 	}
@@ -120,16 +111,11 @@ create_tool_item (GtkAction *action)
 
 	item = (* GTK_ACTION_CLASS (parent_class)->create_tool_item) (action);
 
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox);
-	gtk_container_add (GTK_CONTAINER (item), hbox);
-
 	button = gtk_toggle_button_new ();
-	gtk_widget_add_events (GTK_WIDGET (button), GDK_BUTTON1_MOTION_MASK);
 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 	gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
 	gtk_widget_show (button);
-	gtk_container_add (GTK_CONTAINER (hbox), button);
+	gtk_container_add (GTK_CONTAINER (item), button);
 	g_object_set_data (G_OBJECT (item), "button", button);
 
 	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
@@ -151,560 +137,122 @@ create_tool_item (GtkAction *action)
 }
 
 static void
-menu_deactivate_cb (GtkMenuShell *ms, GtkWidget *button)
-{
-	g_object_set_data (G_OBJECT (button), "popup", NULL);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
-	gtk_button_released (GTK_BUTTON (button));
-}
-
-static void
-menu_activate_cb (GtkWidget *item, GtkAction *action)
+ephy_topic_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
-	EphyBookmarks *bookmarks;
-	EphyNode *node;
-	const char *location;
-	char *address;
-
-	node = g_object_get_data (G_OBJECT (item), "node");
-	location = ephy_node_get_property_string
-		(node, EPHY_NODE_BMK_PROP_LOCATION);
-	g_return_if_fail (location != NULL);
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-	address = ephy_bookmarks_resolve_address (bookmarks, location, NULL);
-	g_return_if_fail (address != NULL);
-
-	ephy_link_open (EPHY_LINK (action), address, NULL,
-			ephy_gui_is_middle_click () ? EPHY_LINK_NEW_TAB : 0);
-
-	g_free (address);
-}
+	GtkWidget *label = NULL;
+	GValue value = { 0, };
+	const char *label_text;
 
-static void
-ephy_topic_action_sync_label (GtkAction *gaction,
-			      GParamSpec *pspec,
-			      GtkWidget *proxy)
-{
-	EphyTopicAction *action = EPHY_TOPIC_ACTION (gaction);
+	g_value_init (&value, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (action), "label", &value);
 
-	g_return_if_fail (EPHY_IS_NODE (action->priv->topic_node));
+	label_text = g_value_get_string (&value);
 
-	/* note that we cannot use ellipsizing label with defined width,
-	 * since that makes the label exactly that wide, even if the
-	 * text takes less space. So we have to shorten the string.
-	 */
 	if (GTK_IS_TOOL_ITEM (proxy))
 	{
-		GtkWidget *label = NULL;
-		char *title, *separator;
-
-		label = g_object_get_data (G_OBJECT (proxy), "label");
-		g_return_if_fail (label != NULL);
-
-		g_object_get (G_OBJECT (action), "label", &title, NULL);
-		g_return_if_fail (label != NULL);
-
-		/* In case this is a multi-hierarchy topic, we only want to
-		 * display the leaf name. See bug #310963.
-		 */
-		separator = g_strrstr (title, BOOKMARKS_HIERARCHY_SEP);
-
-		gtk_label_set_label (GTK_LABEL (label),
-				     separator != NULL ? separator + strlen(BOOKMARKS_HIERARCHY_SEP) : title);
-
-		g_free (title);
-	}
-}
-
-static int
-sort_bookmarks (gconstpointer a, gconstpointer b)
-{
-	EphyNode *node_a = (EphyNode *)a;
-	EphyNode *node_b = (EphyNode *)b;
-	const char *title1, *title2;
-	int retval;
-
-	title1 = ephy_node_get_property_string (node_a, EPHY_NODE_BMK_PROP_TITLE);
-	title2 = ephy_node_get_property_string (node_b, EPHY_NODE_BMK_PROP_TITLE);
-                                                                                                                      
-	if (title1 == NULL)
-	{
-		retval = -1;
+		label = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "label"));
 	}
-	else if (title2 == NULL)
+	else if (GTK_IS_MENU_ITEM (proxy))
 	{
-		retval = 1;
+		label = GTK_BIN (proxy)->child;
 	}
 	else
 	{
-		char *str_a, *str_b;
-
-		str_a = g_utf8_casefold (title1, -1);
-		str_b = g_utf8_casefold (title2, -1);
-		retval = g_utf8_collate (str_a, str_b);
-		g_free (str_a);
-		g_free (str_b);
-	}
-
-	return retval;
-}
-
-static gboolean
-can_open_in_tabs (EphyNode *node)
-{
-	GPtrArray *children;
-	int priority;
-
-	priority = ephy_node_get_property_int (node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-	children = ephy_node_get_children (node);
-
-	return (priority != EPHY_NODE_ALL_PRIORITY) && (children->len > 1);
-}
-
-static void
-append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node, gboolean show_empty)
-{
-        EphyFaviconCache *cache;
-	GtkWidget *item;
-	GtkLabel *label;
-	GPtrArray *children;
-
-        cache = EPHY_FAVICON_CACHE
-		(ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)));
-
-	children = ephy_node_get_children (node);
-
-	if (children->len < 1 && show_empty)
-	{
-		/* This is the adjective, not the verb */
-		item = gtk_menu_item_new_with_label (_("Empty"));
-		gtk_widget_set_sensitive (item, FALSE);
-		gtk_widget_show (item);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
+		g_warning ("Unknown widget");
 		return;
 	}
-	else
-	{
-		GList *node_list = NULL, *l;
-		int i;
-
-		for (i = 0; i < children->len; ++i)
-		{
-			node_list = g_list_prepend (node_list,
-						   g_ptr_array_index (children, i));
-		}
-
-		node_list = g_list_sort (node_list, (GCompareFunc)sort_bookmarks);
-
-		for (l = node_list; l != NULL; l = l->next)
-		{
-			EphyNode *kid = (EphyNode*) l->data;
-			const char *icon_location;
-			const char *title;
-
-			icon_location = ephy_node_get_property_string
-				(kid, EPHY_NODE_BMK_PROP_ICON);
-			title = ephy_node_get_property_string
-				(kid, EPHY_NODE_BMK_PROP_TITLE);
-			if (title == NULL) continue;
 
-			item = gtk_image_menu_item_new_with_label (title);
-			label = (GtkLabel *) ((GtkBin *) item)->child;
-			gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
-			gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
-			gtk_label_set_use_underline (label, FALSE);
+	g_return_if_fail (label != NULL);
 
-			if (icon_location)
-			{
-				GdkPixbuf *icon;
-				GtkWidget *image;
-
-				icon = ephy_favicon_cache_get (cache, icon_location);
-				if (icon != NULL)
-				{
-					image = gtk_image_new_from_pixbuf (icon);
-					gtk_widget_show (image);
-					gtk_image_menu_item_set_image
-						(GTK_IMAGE_MENU_ITEM (item), image);
-					g_object_unref (icon);
-				}
-			}
-
-			g_object_set_data (G_OBJECT (item), "node", kid);
-			g_signal_connect (item, "activate",
-					  G_CALLBACK (menu_activate_cb), action);
-			gtk_widget_show (item);
-			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-		}
-
-		g_list_free (node_list);
+	if (label_text)
+	{
+		gtk_label_set_label (GTK_LABEL (label), label_text);
 	}
+	
+	g_value_unset (&value);
 }
 
-#define TOPIC_NODE_DATA_KEY	"TopicNode"
-
-static void
-open_in_tabs_activate_cb (GtkWidget *item, EphyTopicAction *action)
+static GtkWidget *
+get_popup (EphyTopicAction *action)
 {
-	EphyBookmarks *bookmarks;
-	EphyNode *node;
-	GPtrArray *children;
-	EphyTab *tab = NULL;
-	GList *node_list = NULL, *l;
-	int i;
-
-	node = g_object_get_data (G_OBJECT (item), TOPIC_NODE_DATA_KEY);
-	g_return_if_fail (node != NULL);
-
-	children = ephy_node_get_children (node);
-	for (i = 0; i < children->len; ++i)
-	{
-		node_list = g_list_prepend (node_list,
-					    g_ptr_array_index (children, i));
-	}
-
-	node_list = g_list_sort (node_list, (GCompareFunc) sort_bookmarks);
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+	char path[40];
 
-	for (l = node_list; l != NULL; l = l->next)
+	g_snprintf (path, sizeof (path), "/PopupTopic%ld",
+		    (long int) ephy_node_get_id (action->priv->node));
+	
+	if (action->priv->merge_id == 0)
 	{
-		EphyNode *child = (EphyNode *) l->data;
-		const char *location;
-		char *address;
-
-		location = ephy_node_get_property_string
-			(child, EPHY_NODE_BMK_PROP_LOCATION);
-		g_return_if_fail (location != NULL);
-
-		address = ephy_bookmarks_resolve_address (bookmarks, location, NULL);
-		g_return_if_fail (address != NULL);
-
-		tab = ephy_link_open (EPHY_LINK (action), address, tab,
-				      tab ? EPHY_LINK_NEW_TAB : EPHY_LINK_NEW_WINDOW);
-		g_free (address);
+		GString *popup_menu_string = g_string_new ("");
+		g_string_append_printf (popup_menu_string, "<ui><popup name=\"%s\">", path+1);
+		ephy_bookmarks_menu_build (popup_menu_string, action->priv->node);
+		g_string_append (popup_menu_string, "</popup></ui>");
+		
+		action->priv->merge_id = gtk_ui_manager_add_ui_from_string
+		  (action->priv->manager, popup_menu_string->str, popup_menu_string->len, 0);
+		
+		g_string_free (popup_menu_string, TRUE);
 	}
-
-	g_list_free (node_list);
+	
+	return gtk_ui_manager_get_widget (action->priv->manager, path);
 }
 
-static int
-get_item_position (GtkWidget *widget, gboolean *last)
+static void
+erase_popup (EphyTopicAction *action)
 {
-	GtkWidget *item, *toolbar;
-	int index;
-
-	item = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM);
-	g_return_val_if_fail (item != NULL, -1);
-
-	toolbar = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOLBAR);
-	g_return_val_if_fail (toolbar != NULL, -1);
-
-	index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar),
-				            GTK_TOOL_ITEM (item));
-	if (last)
+	if (action->priv->merge_id != 0)
 	{
-		int n_items;
-
-		n_items = gtk_toolbar_get_n_items (GTK_TOOLBAR (toolbar));
-		*last = (index == n_items - 1);
+		gtk_ui_manager_remove_ui (action->priv->manager, action->priv->merge_id);
+		action->priv->merge_id = 0;
 	}
-
-	return index;
 }
 
 static void
-remove_from_model (GtkWidget *widget)
+child_added_cb (EphyNode *node, EphyNode *child, GObject *object)
 {
-	EphyBookmarks *bookmarks;
-	EggToolbarsModel *model;
-	int pos;
-
-	pos = get_item_position (widget, NULL);
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
-
-	egg_toolbars_model_remove_item (model, 0, pos);
+	EphyTopicAction *action = EPHY_TOPIC_ACTION (object);
+	erase_popup (action);
 }
 
 static void
-move_in_model (GtkWidget *widget, int direction)
+child_changed_cb (EphyNode *node, EphyNode *child, guint property, GObject *object)
 {
-	EphyBookmarks *bookmarks;
-	EggToolbarsModel *model;
-	int pos, new_pos;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks));
-
-	pos = get_item_position (widget, NULL);
-	new_pos = MAX (0, pos + direction);
-
-	egg_toolbars_model_move_item (model, 0, pos, 0, new_pos);
+	EphyTopicAction *action = EPHY_TOPIC_ACTION (object);
+	erase_popup (action);
 }
 
 static void
-remove_activate_cb (GtkWidget *menu, GtkWidget *proxy)
+child_removed_cb (EphyNode *node, EphyNode *child, guint index, GObject *object)
 {
-	remove_from_model (proxy);
+	EphyTopicAction *action = EPHY_TOPIC_ACTION (object);
+	erase_popup (action);
 }
 
 static void
-move_left_activate_cb (GtkWidget *menu, GtkWidget *proxy)
+menu_destroy_cb (GtkWidget *menuitem,
+		 gpointer user_data)
 {
-	move_in_model (proxy, -1);
+	/* Save the submenu from similar destruction,
+	 * because it doesn't rightly belong to this menuitem. */
+	gtk_menu_item_remove_submenu (GTK_MENU_ITEM (menuitem));
 }
 
 static void
-move_right_activate_cb (GtkWidget *menu, GtkWidget *proxy)
-{
-	move_in_model (proxy, +1);
-}
-
-static GtkWidget *
-add_open_in_tabs_menu (EphyTopicAction *action,
-		       GtkWidget *menu,
-		       EphyNode *node)
-{
-	GtkWidget *item;
-	const char *label;
-
-	label = ngettext ("Open in New _Tab",
-			  "Open in New _Tabs",
-			  ephy_node_get_n_children (node));
-
-	item = gtk_menu_item_new_with_mnemonic (label);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	g_object_set_data (G_OBJECT (item), TOPIC_NODE_DATA_KEY, node);
-
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (open_in_tabs_activate_cb), action);
-
-	return item;
-}
-
-static GtkWidget *
-build_bookmarks_menu (EphyTopicAction *action, EphyNode *node)
-{
-	GtkWidget *menu;
-
-	menu = gtk_menu_new ();
-
-	append_bookmarks_menu (action, menu, node, TRUE);
-
-	if (can_open_in_tabs (node))
-	{
-		GtkWidget *item;
-
-		item = gtk_separator_menu_item_new ();
-		gtk_widget_show (item);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-		add_open_in_tabs_menu (action, menu, node);
-	}
-
-	return menu;
-}
-
-static int
-sort_topics (gconstpointer a, gconstpointer b)
-{
-	EphyNode *node_a = (EphyNode *)a;
-	EphyNode *node_b = (EphyNode *)b;
-	const char *title1, *title2;
-	int retval;
-
-	title1 = ephy_node_get_property_string (node_a, EPHY_NODE_KEYWORD_PROP_NAME);
-	title2 = ephy_node_get_property_string (node_b, EPHY_NODE_KEYWORD_PROP_NAME);
-                                                                                                                      
-	if (title1 == NULL)
-	{
-		retval = -1;
-	}
-	else if (title2 == NULL)
-	{
-		retval = 1;
-	}
-	else
-	{
-		char *str_a, *str_b;
-
-		str_a = g_utf8_casefold (title1, -1);
-		str_b = g_utf8_casefold (title2, -1);
-		retval = g_utf8_collate (str_a, str_b);
-		g_free (str_a);
-		g_free (str_b);
-	}
-
-	return retval;
-}
-
-static GtkWidget *
-build_topics_menu (EphyTopicAction *action)
-{
-	GtkWidget *menu, *item;
-	GPtrArray *children;
-	int i;
-	EphyBookmarks *bookmarks;
-	EphyNode *all, *uncategorized, *node;
-	EphyNodePriority priority;
-	GList *node_list = NULL, *l = NULL;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	all = ephy_bookmarks_get_bookmarks (bookmarks);
-	node = ephy_bookmarks_get_keywords (bookmarks);
-
-	menu = gtk_menu_new ();
-
-	children = ephy_node_get_children (node);
-
-	for (i = 0; i < children->len; ++i)
-	{
-		EphyNode *kid;
-
-		kid = g_ptr_array_index (children, i);
-		priority = ephy_node_get_property_int
-			(kid, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-		if (priority == EPHY_NODE_NORMAL_PRIORITY)
-		{
-			node_list = g_list_prepend (node_list, kid);
-		}
-	}
-
-	node_list = g_list_sort (node_list, (GCompareFunc)sort_topics);
-
-	for (l = g_list_first (node_list); l != NULL; l = g_list_next (l))
-	{
-		EphyNode *kid;
-		const char *title;
-		GtkWidget *bmk_menu;
-		GtkLabel *label;
-
-		kid = (EphyNode*)l->data;
-		if (kid == all) continue;
-
-		title = ephy_node_get_property_string
-			(kid, EPHY_NODE_KEYWORD_PROP_NAME);
-
-		item = gtk_image_menu_item_new_with_label (title);
-		label = (GtkLabel *) ((GtkBin *) item)->child;
-		gtk_label_set_max_width_chars (label, MENUITEM_WIDTH_CHARS);
-		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
-
-		gtk_widget_show (item);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-		bmk_menu = build_bookmarks_menu (action, kid);
-		gtk_widget_show (bmk_menu);
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), bmk_menu);
-	}
-	g_list_free (node_list);
-
-	uncategorized = ephy_bookmarks_get_not_categorized (bookmarks);
-	append_bookmarks_menu (action, menu, uncategorized, FALSE);
-
-	return menu;
-}
-
-static GtkWidget *
-build_menu (EphyTopicAction *action)
+menu_init_cb (GtkWidget *menuitem,
+	      EphyTopicAction *action)
 {
-	if (ephy_node_get_id (action->priv->topic_node) == BOOKMARKS_NODE_ID)
-	{
-		return build_topics_menu (action);
-	}
-	else
+	if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)) == NULL)
 	{
-		return build_bookmarks_menu (action, action->priv->topic_node);
+		GtkWidget *popup = get_popup (action);
+		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), popup);
+		g_signal_connect (menuitem, "destroy", G_CALLBACK (menu_destroy_cb), NULL);
 	}
 }
 
 static void
-drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
-		  GtkSelectionData *selection_data, guint info,
-		  guint32 time, EphyTopicAction *action)
-{
-	EphyBookmarks *bookmarks;
-	char *uri;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	g_return_if_fail (bookmarks != NULL);
-
-	uri = ephy_bookmarks_get_topic_uri (bookmarks, action->priv->topic_node);
-	g_return_if_fail (uri != NULL);
-
-	gtk_selection_data_set (selection_data, selection_data->target, 8,
-				(unsigned char *) uri, strlen (uri));
-
-	g_free (uri);
-}
-
-static void
-drag_data_delete_cb (GtkWidget *widget, GdkDragContext *context,
-		     EphyTopicAction *action)
-{
-	remove_from_model (widget);
-}
-
-static void
-stop_drag_check (EphyTopicAction *action, GtkWidget *widget)
-{
-	if (action->priv->motion_handler)
-	{
-		g_signal_handler_disconnect (widget, action->priv->motion_handler);
-		action->priv->motion_handler = 0;
-
-		g_signal_handler_disconnect (widget, action->priv->release_handler);
-		action->priv->release_handler = 0;
-	}
-}
-
-static gboolean
-check_horizontal_threshold (GtkWidget *widget, gint start_x, gint start_y,
-			    gint current_x, gint current_y)
-{
-	gint drag_threshold;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	g_object_get (gtk_widget_get_settings (widget),
-		      "gtk-dnd-drag-threshold", &drag_threshold,
-		      NULL);
-
-	return (ABS (current_x - start_x) > drag_threshold &&
-		ABS (current_y - start_y) < drag_threshold);
-}
-
-static gboolean
-drag_motion_cb (GtkWidget *widget, GdkEventMotion *event, EphyTopicAction *action)
+button_deactivate_cb (GtkMenuShell *ms, GtkWidget *button)
 {
-	GtkWidget *button, *event_widget;
-
-	event_widget = gtk_get_event_widget ((GdkEvent*) event);
-	button = GTK_WIDGET (g_object_get_data (G_OBJECT (widget), "button"));
-
-	if (!gtk_widget_is_ancestor (event_widget, widget) &&
-	    check_horizontal_threshold (widget, action->priv->drag_x,
-				        action->priv->drag_y, event->x, event->y))
-	{
-		GtkTargetList *target_list;
-
-		target_list = gtk_target_list_new (drag_targets, n_drag_targets);
-
-		stop_drag_check (action, widget);
-		gtk_menu_popdown (GTK_MENU (widget));
-		gtk_drag_begin (button, target_list, GDK_ACTION_MOVE |
-				GDK_ACTION_COPY, 1, (GdkEvent*)event);
-
-		gtk_target_list_unref (target_list);
-	}
-
-	return TRUE;
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
+	gtk_button_released (GTK_BUTTON (button));
 }
 
 static void
@@ -713,196 +261,43 @@ button_toggled_cb (GtkWidget *button,
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
 	{
-		GtkWidget *menu;
-		GdkEvent *event;
-		guint32 event_time = 0;
-		guint event_button = 0;
-
-		menu = build_menu (action);
-		g_signal_connect_object (menu, "deactivate",
-					 G_CALLBACK (menu_deactivate_cb), button, 0);
-
-		event = gtk_get_current_event ();
-		if (event != NULL)
-		{
-			if (event->type == GDK_BUTTON_PRESS)
-			{
-				event_button = ((GdkEventButton *) event)->button;
-				event_time = ((GdkEventButton *) event)->time;
-			}
-
-			gdk_event_free (event);
-		}
-
-		if (event_button == 0)
-		{
-			gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-					ephy_gui_menu_position_under_widget,
-					button, 0 , gtk_get_current_event_time ());
-			gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
-		}
-		else
-		{
-			gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-					ephy_gui_menu_position_under_widget,
-					button, event_button, event_time);
-		}
-
-		g_object_set_data (G_OBJECT (button), "popup", menu);
-	}
-}
-
-static GtkWidget *
-create_menu_item (GtkAction *action)
-{
-	GtkWidget *menu, *menu_item;
-	GValue value = { 0, };
-	const char *title;
-
-	g_value_init (&value, G_TYPE_STRING);
-	g_object_get_property (G_OBJECT (action), "label", &value);
-
-	title = g_value_get_string (&value);
-
-	menu_item = gtk_menu_item_new_with_label (title);
-
-	g_value_unset (&value);
-
-	menu = build_menu (EPHY_TOPIC_ACTION (action));
-	gtk_widget_show (menu);
-
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
-
-	return menu_item;
-}
-
-static void
-show_context_menu (EphyTopicAction *action,
-		   GtkWidget *proxy,
-		   GdkEventButton *event,
-		   GtkMenuPositionFunc func)
-{
-	GtkWidget *menu, *item, *image;
-	gboolean last;
-
-	menu = gtk_menu_new ();
-
-	item = add_open_in_tabs_menu (action, menu, action->priv->topic_node);
-	gtk_widget_set_sensitive (item, can_open_in_tabs (action->priv->topic_node));
-
-	item = gtk_separator_menu_item_new ();
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Remove from Toolbar"));
-	gtk_widget_show (item);
-	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	gtk_widget_show (image);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (remove_activate_cb), proxy);
-
-	item = gtk_separator_menu_item_new ();
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	item = gtk_menu_item_new_with_mnemonic (_("Move _Left"));
-	gtk_widget_set_sensitive (item, get_item_position (proxy, NULL) > 0);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (move_left_activate_cb), proxy);
-
-	item = gtk_menu_item_new_with_mnemonic (_("Move Ri_ght"));
-	get_item_position (proxy, &last);
-	gtk_widget_set_sensitive (item, !last);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	g_signal_connect (item, "activate",
-			  G_CALLBACK (move_right_activate_cb), proxy);
-
-	if (event != NULL)
-	{
-		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, func, proxy,
-				event->button, event->time);
-	}
-	else
-	{
-		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, func, proxy, 0,
-				gtk_get_current_event_time ());
-		gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+		GtkWidget *popup = get_popup (action);
+		g_signal_connect_object (popup, "deactivate",
+					 G_CALLBACK (button_deactivate_cb), button, 0);
+		gtk_menu_popup (GTK_MENU (popup), NULL, NULL,
+				ephy_gui_menu_position_under_widget,
+				button, 1, gtk_get_current_event_time ());
 	}
 }
 
 static gboolean
-popup_menu_cb (GtkWidget *widget, EphyTopicAction *action)
-{
-	if (gtk_widget_get_ancestor (widget, EPHY_TYPE_BOOKMARKSBAR))
-        {
-                show_context_menu (action, widget, NULL,
-				   ephy_gui_menu_position_under_widget);
-		return TRUE;
-        }
-
-	return FALSE;
-}
-
-static gboolean
-button_release_cb (GtkWidget *widget,
+button_release_cb (GtkWidget *button,
                    GdkEventButton *event,
 		   EphyTopicAction *action)
 {
 	if (event->button == 1)
 	{
-		stop_drag_check (action, widget);
-
-		if (GTK_IS_TOGGLE_BUTTON (widget))
-		{
-			gtk_toggle_button_set_active
-				(GTK_TOGGLE_BUTTON (widget), FALSE);
-		}
+                gtk_toggle_button_set_active
+                  (GTK_TOGGLE_BUTTON (button), FALSE);
 	}
 
 	return FALSE;
 }
 
 static gboolean
-button_press_cb (GtkWidget *widget,
+button_press_cb (GtkWidget *button,
 		 GdkEventButton *event,
 		 EphyTopicAction *action)
 {
-	if (event->button == 1 &&
-	    gtk_widget_get_ancestor (widget, EPHY_TYPE_BOOKMARKSBAR))
+	if (event->button == 1)
 	{
-		if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+		if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
 		{
-			GtkWidget *menu;
-
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-			menu = g_object_get_data (G_OBJECT (widget), "popup");
-			g_return_val_if_fail (menu != NULL, FALSE);
-
-			g_object_set_data (G_OBJECT (menu), "button", widget);
-
-			action->priv->drag_x = event->x;
-			action->priv->drag_y = event->y;
-			action->priv->motion_handler = g_signal_connect
-				(menu, "motion_notify_event",
-				 G_CALLBACK (drag_motion_cb), action);
-			action->priv->release_handler = g_signal_connect
-				(menu, "button_release_event",
-				 G_CALLBACK (button_release_cb), action);
-		
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+                        button_toggled_cb (button, action);
 			return TRUE;
 		}
 	}
-	else if (event->button == 3 &&
-	         gtk_widget_get_ancestor (widget, EPHY_TYPE_BOOKMARKSBAR))	
-	{
-		show_context_menu (action, widget, event, NULL);
-		return TRUE;
-	}
 
 	return FALSE;
 }
@@ -910,113 +305,140 @@ button_press_cb (GtkWidget *widget,
 static void
 connect_proxy (GtkAction *action, GtkWidget *proxy)
 {
-	GtkWidget *button;
-
-	LOG ("connect_proxy action %p, proxy %p", action, proxy);
-
 	(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+    
+	ephy_topic_action_sync_label (action, NULL, proxy);
+	g_signal_connect_object (action, "notify::label",
+				 G_CALLBACK (ephy_topic_action_sync_label), proxy, 0);
 
 	if (GTK_IS_TOOL_ITEM (proxy))
 	{
-		ephy_topic_action_sync_label (action, NULL, proxy);
-		g_signal_connect_object (action, "notify::label",
-					 G_CALLBACK (ephy_topic_action_sync_label), proxy, 0);
-
-		button = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "button"));
+		GtkWidget *button = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "button"));
 		g_signal_connect (button, "toggled",
 				  G_CALLBACK (button_toggled_cb), action);
-		g_signal_connect (button, "popup_menu",
-				  G_CALLBACK (popup_menu_cb), action);
 		g_signal_connect (button, "button-press-event",
 				  G_CALLBACK (button_press_cb), action);
 		g_signal_connect (button, "button-release-event",
 				  G_CALLBACK (button_release_cb), action);
-		g_signal_connect (button, "drag_data_get",
-				  G_CALLBACK (drag_data_get_cb), action);
-		g_signal_connect (button, "drag_data_delete",
-				  G_CALLBACK (drag_data_delete_cb), action);
 	}
 	else if (GTK_IS_MENU_ITEM (proxy))
 	{
-		GtkLabel *label;
-
-		label = (GtkLabel *) ((GtkBin *) proxy)->child;
-
-		gtk_label_set_use_underline (label, FALSE);
-		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
-		gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
+		g_signal_connect (proxy, "map", G_CALLBACK (menu_init_cb), action);
 	}
 }
 
-static void
-topic_changed_cb (EphyNode *node,
-		  guint property_id,
-		  EphyTopicAction *action)
+void
+ephy_topic_action_updated (EphyTopicAction *action)
 {
-	if (property_id == EPHY_NODE_KEYWORD_PROP_NAME)
+	GValue value = { 0, };
+	const char *title;
+	int priority;
+	
+	g_return_if_fail (action->priv->node != NULL);
+	
+	priority = ephy_node_get_property_int 
+	  (action->priv->node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
+	
+	if (priority == EPHY_NODE_ALL_PRIORITY)
 	{
-		GValue value = { 0, };
-		const char *title;
-		int priority;
-
-		priority = ephy_node_get_property_int 
-			(node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-
-		if (priority == EPHY_NODE_ALL_PRIORITY)
-		{
-			title = _("Bookmarks");
-		}
-		else
-		{
-			title = ephy_node_get_property_string
-				(node, EPHY_NODE_KEYWORD_PROP_NAME);
-		}
-
-		g_value_init(&value, G_TYPE_STRING);
-		g_value_set_static_string (&value, title);
-		g_object_set_property (G_OBJECT (action), "label", &value);
-		g_value_unset (&value);
+		title = _("Bookmarks");
+	}
+	else
+	{
+		title = ephy_node_get_property_string
+		  (action->priv->node, EPHY_NODE_KEYWORD_PROP_NAME);
 	}
+	
+	g_value_init(&value, G_TYPE_STRING);
+	g_value_set_static_string (&value, title);
+	g_object_set_property (G_OBJECT (action), "label", &value);
+	g_object_set_property (G_OBJECT (action), "tooltip", &value);
+	g_value_unset (&value);
 }
 
-static void
+EphyNode *
+ephy_topic_action_get_topic (EphyTopicAction *action)
+{
+	return action->priv->node;
+}
+
+void
 ephy_topic_action_set_topic (EphyTopicAction *action,
 			     EphyNode *node)
 {
-	action->priv->topic_node = node;
+	g_return_if_fail (node != NULL);
+	
+	if (action->priv->node == node) return;
+
+	if (action->priv->node != NULL)
+	{
+		ephy_node_signal_disconnect_object
+		  (action->priv->node, EPHY_NODE_CHILD_ADDED,
+		   (EphyNodeCallback)child_added_cb, G_OBJECT (action));
+		ephy_node_signal_disconnect_object
+		  (action->priv->node, EPHY_NODE_CHILD_CHANGED,
+		   (EphyNodeCallback)child_changed_cb, G_OBJECT (action));
+		ephy_node_signal_disconnect_object
+		  (action->priv->node, EPHY_NODE_CHILD_REMOVED,
+		   (EphyNodeCallback)child_removed_cb, G_OBJECT (action));
+	}
 
-	topic_changed_cb (node, EPHY_NODE_KEYWORD_PROP_NAME, action);
-	ephy_node_signal_connect_object (node, EPHY_NODE_CHANGED,
-				         (EphyNodeCallback) topic_changed_cb,
-				         G_OBJECT (action));
+	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_ADDED,
+					 (EphyNodeCallback)child_added_cb,
+					 G_OBJECT (action));
+	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_CHANGED,
+					 (EphyNodeCallback)child_changed_cb,
+					 G_OBJECT (action));
+	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_REMOVED,
+					 (EphyNodeCallback)child_removed_cb,
+					 G_OBJECT (action));
+
+	action->priv->node = node;
+	
+	erase_popup (action);
+	
+	g_object_freeze_notify (G_OBJECT (action));
+	g_object_notify (G_OBJECT (action), "topic");
+	ephy_topic_action_updated (action);
+	g_object_thaw_notify (G_OBJECT (action));
 }
 
 static void
 ephy_topic_action_set_property (GObject *object,
-                                guint prop_id,
-                                const GValue *value,
-                                GParamSpec *pspec)
+				guint prop_id,
+				const GValue *value,
+				GParamSpec *pspec)
 {
-	EphyTopicAction *topic;
-
-	topic = EPHY_TOPIC_ACTION (object);
+	EphyTopicAction *action = EPHY_TOPIC_ACTION (object);
 
 	switch (prop_id)
 	{
 		case PROP_TOPIC:
-			ephy_topic_action_set_topic (topic, g_value_get_pointer (value));
+			ephy_topic_action_set_topic (action, g_value_get_pointer (value));
+			break;
+		case PROP_MANAGER:
+			action->priv->manager = g_value_get_object (value);
 			break;
 	}
 }
 
 static void
 ephy_topic_action_get_property (GObject *object,
-                                   guint prop_id,
-                                   GValue *value,
-                                   GParamSpec *pspec)
+				   guint prop_id,
+				   GValue *value,
+				   GParamSpec *pspec)
 {
-	/* no readable properties */
-	g_return_if_reached ();
+	EphyTopicAction *action = EPHY_TOPIC_ACTION (object);
+
+	switch (prop_id)
+	{
+		case PROP_TOPIC:
+			g_value_set_pointer (value, action->priv->node);
+			break;
+		case PROP_MANAGER:
+			g_value_set_object (value, action->priv->manager);
+			break;
+	}
 }
 
 static void
@@ -1029,21 +451,28 @@ ephy_topic_action_class_init (EphyTopicActionClass *class)
 
 	action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM;
 	action_class->create_tool_item = create_tool_item;
-	action_class->create_menu_item = create_menu_item;
 	action_class->connect_proxy = connect_proxy;
 
 	object_class->set_property = ephy_topic_action_set_property;
 	object_class->get_property = ephy_topic_action_get_property;
 
-	g_object_class_install_property
-		(object_class,
-		 PROP_TOPIC,
-		 g_param_spec_pointer ("topic",
-				       "Topic",
-				       "Topic",
-				       G_PARAM_WRITABLE |
-				       G_PARAM_CONSTRUCT_ONLY));
-
+	g_object_class_install_property (object_class,
+					 PROP_TOPIC,
+					 g_param_spec_pointer ("topic",
+							       "Topic",
+							       "Topic",
+							       G_PARAM_READWRITE |
+							       G_PARAM_CONSTRUCT_ONLY));
+
+	g_object_class_install_property (object_class,
+					 PROP_MANAGER,
+					 g_param_spec_object ("manager",
+							      "Manager",
+							      "UI Manager",
+							      GTK_TYPE_UI_MANAGER,
+							      G_PARAM_WRITABLE |
+							      G_PARAM_CONSTRUCT_ONLY));
+	
 	g_type_class_add_private (object_class, sizeof(EphyTopicActionPrivate));
 }
 
@@ -1051,14 +480,27 @@ static void
 ephy_topic_action_init (EphyTopicAction *action)
 {
 	action->priv = EPHY_TOPIC_ACTION_GET_PRIVATE (action);
+	
+	action->priv->merge_id = 0;
+	action->priv->node = NULL;
+	action->priv->manager = NULL;
+}
+
+char *
+ephy_topic_action_name (EphyNode *node)
+{
+	return g_strdup_printf("Tpc%u", ephy_node_get_id (node));
 }
 
 GtkAction *
-ephy_topic_action_new (const char *name,
-		       EphyNode *node)
+ephy_topic_action_new (EphyNode *node, GtkUIManager *manager, char *name)
 {
-	return g_object_new (EPHY_TYPE_TOPIC_ACTION,
-			     "name", name,
-			     "topic", node,
-			     NULL);
+	if(!name) name = ephy_topic_action_name (node);
+	g_return_val_if_fail (name, NULL);
+
+	return GTK_ACTION (g_object_new (EPHY_TYPE_TOPIC_ACTION,
+					 "name", name,
+					 "topic", node,
+					 "manager", manager,
+					 NULL));
 }