Add EPHY_NODE_CHANGED signal. Patch by Peter Harvey.

2004-10-24  Christian Persch  <chpe@cvs.gnome.org>

	* lib/ephy-node.c: (callback), (ephy_node_set_property),
	(ephy_node_signal_connect_object), (match_signal_data),
	(ephy_node_signal_disconnect_object):
	* lib/ephy-node.h:

	Add EPHY_NODE_CHANGED signal. Patch by Peter Harvey.

	* src/bookmarks/ephy-bookmark-action.c: (favicon_cache_changed_cb),
	(ephy_bookmark_action_sync_icon),
	(ephy_bookmark_action_sync_label), (open_in_tab_activate_cb),
	(open_in_window_activate_cb), (activate_cb), (drag_data_get_cb),
	(properties_activate_cb), (bookmark_changed_cb),
	(bookmark_destroy_cb), (ephy_bookmark_action_set_bookmark),
	(ephy_bookmark_action_set_property),
	(ephy_bookmark_action_get_property),
	(ephy_bookmark_action_finalize), (ephy_bookmark_action_class_init),
	(smart_child_added_cb), (smart_child_removed_cb),
	(ephy_bookmark_action_init), (ephy_bookmark_action_new):
	* src/bookmarks/ephy-bookmark-action.h:
	* src/bookmarks/ephy-bookmarks-menu.c: (add_action_for_bookmark):
	* src/bookmarks/ephy-bookmarksbar.c:
	(ephy_bookmarksbar_action_request):
	* src/bookmarks/ephy-favorites-menu.c:
	(ephy_favorites_menu_rebuild):
	* src/bookmarks/ephy-topic-action.c: (build_menu),
	(topic_changed_cb), (ephy_topic_action_set_topic),
	(ephy_topic_action_set_property), (ephy_topic_action_get_property),
	(ephy_topic_action_class_init), (ephy_topic_action_init),
	(ephy_topic_action_new):
	* src/bookmarks/ephy-topic-action.h:

	Changed ephy_[bookmark|topic]_action_new from node-id to node. Saves one
	round-trip node->node-id->node.

	Save lots of strdups by using the node's properties directly, instead of
	storing them again in the action.

	Listen to changes on the node itself, not for child-changed on the
	bookmarks node.

10 files changed, 321 insertions, 281 deletions

diff --git a/ChangeLog b/ChangeLog
index e35666aeb..bc86eea4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2004-10-24  Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/ephy-node.c: (callback), (ephy_node_set_property),
+	(ephy_node_signal_connect_object), (match_signal_data),
+	(ephy_node_signal_disconnect_object):
+	* lib/ephy-node.h:
+
+	Add EPHY_NODE_CHANGED signal. Patch by Peter Harvey.
+
+	* src/bookmarks/ephy-bookmark-action.c: (favicon_cache_changed_cb),
+	(ephy_bookmark_action_sync_icon),
+	(ephy_bookmark_action_sync_label), (open_in_tab_activate_cb),
+	(open_in_window_activate_cb), (activate_cb), (drag_data_get_cb),
+	(properties_activate_cb), (bookmark_changed_cb),
+	(bookmark_destroy_cb), (ephy_bookmark_action_set_bookmark),
+	(ephy_bookmark_action_set_property),
+	(ephy_bookmark_action_get_property),
+	(ephy_bookmark_action_finalize), (ephy_bookmark_action_class_init),
+	(smart_child_added_cb), (smart_child_removed_cb),
+	(ephy_bookmark_action_init), (ephy_bookmark_action_new):
+	* src/bookmarks/ephy-bookmark-action.h:
+	* src/bookmarks/ephy-bookmarks-menu.c: (add_action_for_bookmark):
+	* src/bookmarks/ephy-bookmarksbar.c:
+	(ephy_bookmarksbar_action_request):
+	* src/bookmarks/ephy-favorites-menu.c:
+	(ephy_favorites_menu_rebuild):
+	* src/bookmarks/ephy-topic-action.c: (build_menu),
+	(topic_changed_cb), (ephy_topic_action_set_topic),
+	(ephy_topic_action_set_property), (ephy_topic_action_get_property),
+	(ephy_topic_action_class_init), (ephy_topic_action_init),
+	(ephy_topic_action_new):
+	* src/bookmarks/ephy-topic-action.h:
+
+	Changed ephy_[bookmark|topic]_action_new from node-id to node. Saves one
+	round-trip node->node-id->node.
+
+	Save lots of strdups by using the node's properties directly, instead of
+	storing them again in the action.
+
+	Listen to changes on the node itself, not for child-changed on the
+	bookmarks node.
+
 2004-10-23  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/mozilla-embed-single.cpp: (mozilla_embed_single_dispose):
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index db9990147..63210f2a6 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -111,6 +111,16 @@ callback (long id, EphyNodeSignalData *data, gpointer *dummy)
 			data->callback (data->node, data->data);
 		break;
 
+		case EPHY_NODE_CHANGED:
+		{
+			guint property_id;
+
+			property_id = va_arg (valist, guint);
+		
+			data->callback (data->node, property_id, data->data);
+		}
+		break;
+
 		case EPHY_NODE_CHILD_ADDED:
 		{
 			EphyNode *node;
@@ -428,6 +438,8 @@ ephy_node_set_property (EphyNode *node,
 	g_hash_table_foreach (node->parents,
 			      (GHFunc) child_changed,
 			      &change);
+    
+	ephy_node_emit_signal (node, EPHY_NODE_CHANGED, property_id);
 }
 
 gboolean
@@ -1151,6 +1163,35 @@ ephy_node_signal_connect_object (EphyNode *node,
 	return ret;
 }
 
+static gboolean
+match_signal_data (gpointer key, EphyNodeSignalData *signal_data,
+                   EphyNodeSignalData *user_data)
+{
+        return (user_data->data == signal_data->data &&
+                user_data->type == signal_data->type &&
+                user_data->callback == signal_data->callback);
+                
+}
+
+guint
+ephy_node_signal_disconnect_object (EphyNode *node,
+                                    EphyNodeSignalType type,
+                                    EphyNodeCallback callback,
+                                    GObject *object)
+{
+        EphyNodeSignalData user_data;
+        
+	g_return_val_if_fail (node->signals, 0);
+
+        user_data.callback = callback;
+        user_data.type = type;
+        user_data.data = object;
+        
+        return g_hash_table_foreach_remove (node->signals,
+                                            (GHRFunc)match_signal_data,
+                                            &user_data);
+}
+
 void
 ephy_node_signal_disconnect (EphyNode *node,
 			     int signal_id)
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index b2c13225e..9bbe5343a 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -38,6 +38,7 @@ typedef enum
 {
 	EPHY_NODE_DESTROY,           /* EphyNode *node */
 	EPHY_NODE_RESTORED,          /* EphyNode *node */
+	EPHY_NODE_CHANGED,           /* EphyNode *node, guint property_id */
 	EPHY_NODE_CHILD_ADDED,       /* EphyNode *node, EphyNode *child */
 	EPHY_NODE_CHILD_CHANGED,     /* EphyNode *node, EphyNode *child, guint property_id */
 	EPHY_NODE_CHILD_REMOVED,     /* EphyNode *node, EphyNode *child, guint old_index */
@@ -68,6 +69,11 @@ int         ephy_node_signal_connect_object (EphyNode *node,
 					     EphyNodeCallback callback,
 					     GObject *object);
 
+guint       ephy_node_signal_disconnect_object (EphyNode *node,
+					     EphyNodeSignalType type,
+					     EphyNodeCallback callback,
+					     GObject *object);
+
 void        ephy_node_signal_disconnect     (EphyNode *node,
 					     int signal_id);
 
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 5cc97b949..14de49a99 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  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
@@ -55,13 +56,10 @@ static int n_drag_targets = G_N_ELEMENTS (drag_targets);
 
 struct EphyBookmarkActionPrivate
 {
-	EphyNode *bmk_node;
-	int bookmark_id;
-	char *location;
+	EphyNode *node;
 	gboolean smart_url;
-	char *icon;
 	guint cache_handler;
-	GtkWidget *prop_dialog;
+	GtkWidget *prop_dialog;	
 
 	guint motion_handler;
 	gint drag_x;
@@ -71,7 +69,7 @@ struct EphyBookmarkActionPrivate
 enum
 {
 	PROP_0,
-	PROP_BOOKMARK_ID,
+	PROP_BOOKMARK,
 	PROP_TOOLTIP,
 	PROP_LOCATION,
 	PROP_SMART_URL,
@@ -185,10 +183,17 @@ ephy_bookmark_action_sync_smart_url (GtkAction *action, GParamSpec *pspec, GtkWi
 
 static void
 favicon_cache_changed_cb (EphyFaviconCache *cache,
-			  const char *icon,
+			  const char *icon_address,
 			  EphyBookmarkAction *action)
 {
-	if (action->priv->icon && strcmp (icon, action->priv->icon) == 0)
+	const char *icon;
+
+	g_return_if_fail (action->priv->node != NULL);
+
+	icon = ephy_node_get_property_string (action->priv->node,
+					      EPHY_NODE_BMK_PROP_ICON);
+	
+	if (icon != NULL && strcmp (icon, icon_address) == 0)
 	{
 		g_signal_handler_disconnect (cache, action->priv->cache_handler);
 		action->priv->cache_handler = 0;
@@ -201,11 +206,14 @@ static void
 ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
 	EphyBookmarkAction *bma = EPHY_BOOKMARK_ACTION (action);
-	char *icon_location;
+	const char *icon_location;
 	EphyFaviconCache *cache;
 	GdkPixbuf *pixbuf = NULL;
 
-	icon_location = bma->priv->icon;
+	g_return_if_fail (bma->priv->node != NULL);
+
+	icon_location = ephy_node_get_property_string (bma->priv->node,
+						       EPHY_NODE_BMK_PROP_ICON);
 
 	cache = EPHY_FAVICON_CACHE (ephy_embed_shell_get_favicon_cache
 		(EPHY_EMBED_SHELL (ephy_shell)));
@@ -259,68 +267,79 @@ ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget
 static void
 ephy_bookmark_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget *proxy)
 {
-	GtkWidget *label;
-	char *label_text;
-	char *title;
+	GtkWidget *label = NULL;
 	GValue value = { 0, };
 
 	g_value_init (&value, G_TYPE_STRING);
 	g_object_get_property (G_OBJECT (action), "label", &value);
-                                                                                                                             
-	title = ephy_string_shorten (g_value_get_string (&value),
-				     MAX_LABEL_LENGTH);
-	g_value_unset (&value);
 
 	if (EPHY_BOOKMARK_ACTION (action)->priv->smart_url
 	    && GTK_IS_TOOL_ITEM (proxy))
 	{
-		label_text = g_strdup_printf (_("%s:"), title);
-	}
-	else
-	{
-		label_text = g_strdup (title);
-	}
+		char *label_text;
+
+		label_text = g_strdup_printf (_("%s:"), g_value_get_string (&value));
 
-	if (GTK_IS_TOOL_ITEM (proxy))
-	{
 		label = g_object_get_data (G_OBJECT (proxy), "label");
 		g_return_if_fail (label != NULL);
-	}
-	else if (GTK_IS_MENU_ITEM (proxy))
-	{
-		label = GTK_BIN (proxy)->child;
+
+		gtk_label_set_label (GTK_LABEL (label), label_text);
+		g_free (label_text);
 	}
 	else
 	{
-		g_warning ("Unkown widget");
-		return;
-	}
+		if (GTK_IS_TOOL_ITEM (proxy))
+		{
+			label = g_object_get_data (G_OBJECT (proxy), "label");
+			g_return_if_fail (label != NULL);
+		}
+		else if (GTK_IS_MENU_ITEM (proxy))
+		{
+			label = GTK_BIN (proxy)->child;
+		}
+		g_return_if_fail (label != NULL);
 
-	gtk_label_set_label (GTK_LABEL (label), label_text);
+		gtk_label_set_label (GTK_LABEL (label), g_value_get_string (&value));
+	}
 
-	g_free (label_text);
-	g_free (title);
+	g_value_unset (&value);
 }
 
 static void
 open_in_tab_activate_cb (GtkWidget *widget, EphyBookmarkAction *action)
 {
-	g_signal_emit (action, signals[OPEN_IN_TAB], 0,
-		       action->priv->location, FALSE);
+	const char *url;
+
+	g_return_if_fail (action->priv->node != NULL);
+
+	url = ephy_node_get_property_string (action->priv->node,
+					     EPHY_NODE_BMK_PROP_LOCATION);
+	g_signal_emit (action, signals[OPEN_IN_TAB], 0, url, FALSE);
 }
 
 static void
 open_in_window_activate_cb (GtkWidget *widget, EphyBookmarkAction *action)
 {
-	g_signal_emit (action, signals[OPEN_IN_TAB], 0,
-		       action->priv->location, TRUE);
+	const char *url;
+
+	g_return_if_fail (action->priv->node != NULL);
+
+	url = ephy_node_get_property_string (action->priv->node,
+					     EPHY_NODE_BMK_PROP_LOCATION);
+	g_signal_emit (action, signals[OPEN_IN_TAB], 0, url, TRUE);
 }
 
 static void
-activate_cb (GtkWidget *widget, GtkAction *action)
+activate_cb (GtkWidget *widget,
+	     EphyBookmarkAction *action)
 {
-	char *location = NULL;
-	char *text = NULL;
+	const char *url;
+	char *location = NULL, *text = NULL;
+
+	g_return_if_fail (action->priv->node != NULL);
+
+	url = ephy_node_get_property_string (action->priv->node,
+					     EPHY_NODE_BMK_PROP_LOCATION);
 
 	if (GTK_IS_EDITABLE (widget))
 	{
@@ -329,25 +348,21 @@ activate_cb (GtkWidget *widget, GtkAction *action)
 
 	if (text != NULL && text[0] != '\0')
 	{
-		char *smart_url;
 		EphyBookmarks *bookmarks;
 
 		bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
-		smart_url = EPHY_BOOKMARK_ACTION (action)->priv->location;
 		location = ephy_bookmarks_solve_smart_url (bookmarks,
-							   smart_url,
+							   url,
 							   text);
 	}
 	else
 	{
-		EphyBookmarkAction *baction = EPHY_BOOKMARK_ACTION (action);
-
-		if (baction->priv->smart_url)
+		if (action->priv->smart_url)
 		{
 			GnomeVFSURI *uri;
 
-			uri = gnome_vfs_uri_new (baction->priv->location);
+			uri = gnome_vfs_uri_new (url);
 
 			if (uri)
 			{
@@ -358,7 +373,7 @@ activate_cb (GtkWidget *widget, GtkAction *action)
 
 		if (location == NULL)
 		{
-			location = g_strdup (baction->priv->location);
+			location = g_strdup (url);
 		}
 	}
 
@@ -390,8 +405,12 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
 		  GtkSelectionData *selection_data, guint info,
 		  guint32 time, EphyBookmarkAction *action)
 {
-	char *address = action->priv->location;
+	const char *address;
+
+	g_return_if_fail (action->priv->node != NULL);
 
+	address = ephy_node_get_property_string (action->priv->node,
+						 EPHY_NODE_BMK_PROP_LOCATION);
 	g_return_if_fail (address != NULL);
 
 	gtk_selection_data_set (selection_data, selection_data->target, 8,
@@ -513,7 +532,7 @@ properties_activate_cb (GtkWidget *menu, EphyBookmarkAction *action)
 	if (p->prop_dialog == NULL)
 	{
 		p->prop_dialog = ephy_bookmark_properties_new
-				(bookmarks, p->bmk_node, GTK_WINDOW (window));
+				(bookmarks, p->node, GTK_WINDOW (window));
 		g_object_add_weak_pointer (G_OBJECT (p->prop_dialog),
 					   (gpointer)&p->prop_dialog);
 	}
@@ -689,26 +708,64 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 }
 
 static void
+bookmark_changed_cb (EphyNode *node,
+		     guint property_id,
+		     EphyBookmarkAction *action)
+{
+	if (property_id == EPHY_NODE_BMK_PROP_TITLE)
+	{
+		GValue value = { 0, };
+		const char *tmp;
+		char *title, *short_title;
+
+		tmp = ephy_node_get_property_string
+			(action->priv->node, EPHY_NODE_BMK_PROP_TITLE);
+		title = ephy_string_double_underscores (tmp);
+		short_title = ephy_string_shorten (title, MAX_LABEL_LENGTH);
+		g_free (title);
+
+		g_value_init (&value, G_TYPE_STRING);
+		g_value_take_string (&value, short_title);
+		g_object_set (G_OBJECT (action), "label", short_title, NULL);
+		g_value_unset (&value);
+	}
+	else if (property_id == EPHY_NODE_BMK_PROP_ICON)
+	{
+		g_object_notify (G_OBJECT (action), "icon");
+	}
+}
+
+static void
 bookmark_destroy_cb (EphyNode *node, EphyBookmarkAction *action)
 {
 	if (action->priv->prop_dialog != NULL)
 	{
 		gtk_widget_destroy (action->priv->prop_dialog);
+		action->priv->node = NULL;
 	}
 }
 
 static void
-ephy_bookmark_action_set_bookmark_id (EphyBookmarkAction *action, guint id)
+ephy_bookmark_action_set_bookmark (EphyBookmarkAction *action,
+				   EphyNode *node)
 {
 	EphyBookmarks *bookmarks;
+	EphyNode *smart_bmks;
 
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+	g_return_if_fail (node != NULL);
 
-	action->priv->bookmark_id = id;
-	action->priv->bmk_node = ephy_bookmarks_get_from_id
-				(bookmarks, action->priv->bookmark_id);
+	action->priv->node = node;
 
-	ephy_node_signal_connect_object (action->priv->bmk_node, EPHY_NODE_DESTROY,
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+	smart_bmks = ephy_bookmarks_get_smart_bookmarks (bookmarks);
+	action->priv->smart_url = ephy_node_has_child (smart_bmks, node);
+
+	bookmark_changed_cb (node, EPHY_NODE_BMK_PROP_TITLE, action);
+//	bookmark_changed_cb (node, EPHY_NODE_BMK_PROP_ICON, action);
+	ephy_node_signal_connect_object (node, EPHY_NODE_CHANGED,
+					 (EphyNodeCallback) bookmark_changed_cb,
+					 G_OBJECT (action));
+	ephy_node_signal_connect_object (node, EPHY_NODE_DESTROY,
 					 (EphyNodeCallback) bookmark_destroy_cb,
 					 G_OBJECT (action));
 }
@@ -719,27 +776,19 @@ ephy_bookmark_action_set_property (GObject *object,
                                    const GValue *value,
                                    GParamSpec *pspec)
 {
-	EphyBookmarkAction *bmk;
-
-	bmk = EPHY_BOOKMARK_ACTION (object);
+	EphyBookmarkAction *action = EPHY_BOOKMARK_ACTION (object);
 
 	switch (prop_id)
 	{
-		case PROP_BOOKMARK_ID:
-			ephy_bookmark_action_set_bookmark_id
-					(bmk, g_value_get_int (value));
+		case PROP_BOOKMARK:
+			ephy_bookmark_action_set_bookmark
+					(action, g_value_get_pointer (value));
 			break;
 		case PROP_TOOLTIP:
 		case PROP_LOCATION:
-			g_free (bmk->priv->location);
-			bmk->priv->location = g_strdup (g_value_get_string (value));
-			break;
 		case PROP_SMART_URL:
-			bmk->priv->smart_url = g_value_get_boolean (value);
-			break;
 		case PROP_ICON:
-			g_free (bmk->priv->icon);
-			bmk->priv->icon = g_value_dup_string (value);
+			/* not writable */
 			break;
 	}
 }
@@ -750,24 +799,28 @@ ephy_bookmark_action_get_property (GObject *object,
                                    GValue *value,
                                    GParamSpec *pspec)
 {
-	EphyBookmarkAction *bmk;
+	EphyBookmarkAction *action = EPHY_BOOKMARK_ACTION (object);
 
-	bmk = EPHY_BOOKMARK_ACTION (object);
+	g_return_if_fail (action->priv->node != NULL);
 
 	switch (prop_id)
 	{
-		case PROP_BOOKMARK_ID:
-			g_value_set_boolean (value, bmk->priv->bookmark_id);
+		case PROP_BOOKMARK:
+			g_value_set_pointer (value, action->priv->node);
 			break;
 		case PROP_TOOLTIP:
 		case PROP_LOCATION:
-			g_value_set_string (value, bmk->priv->location);
+			g_value_set_string (value,
+				ephy_node_get_property_string (action->priv->node,
+					EPHY_NODE_BMK_PROP_LOCATION));
 			break;
 		case PROP_SMART_URL:
-			g_value_set_boolean (value, bmk->priv->smart_url);
+			g_value_set_boolean (value, action->priv->smart_url);
 			break;
 		case PROP_ICON:
-			g_value_set_string (value, bmk->priv->icon);
+			g_value_set_string (value,
+				ephy_node_get_property_string (action->priv->node,
+					EPHY_NODE_BMK_PROP_ICON));
 			break;
 	}
 }
@@ -783,9 +836,6 @@ ephy_bookmark_action_finalize (GObject *object)
 					      (gpointer)&eba->priv->prop_dialog);
 	}
 
-	g_free (eba->priv->location);
-	g_free (eba->priv->icon);
-
 	LOG ("Bookmark action %p finalized", object)
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -832,101 +882,56 @@ ephy_bookmark_action_class_init (EphyBookmarkActionClass *class)
 			      G_TYPE_BOOLEAN);
 
 	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));
+                                         PROP_BOOKMARK,
+					 g_param_spec_pointer ("bookmark",
+							       "Bookmark",
+							       "Bookmark",
+							       G_PARAM_READWRITE |
+							       G_PARAM_CONSTRUCT_ONLY));
+
+	/* overwrite GtkActionClass::tooltip, so we can use the url as tooltip */
 	g_object_class_install_property (object_class,
-                                         PROP_LOCATION,
+                                         PROP_TOOLTIP,
                                          g_param_spec_string  ("tooltip",
                                                                "Tooltip",
                                                                "Tooltip",
                                                                NULL,
-                                                               G_PARAM_READWRITE));
+                                                               G_PARAM_READABLE));
+
 	g_object_class_install_property (object_class,
                                          PROP_LOCATION,
                                          g_param_spec_string  ("location",
                                                                "Location",
                                                                "Location",
                                                                NULL,
-                                                               G_PARAM_READWRITE));
+                                                               G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
                                          PROP_SMART_URL,
                                          g_param_spec_boolean  ("smarturl",
                                                                 "Smart url",
                                                                 "Smart url",
                                                                 FALSE,
-                                                                G_PARAM_READWRITE));
+                                                                G_PARAM_READABLE));
 	g_object_class_install_property (object_class,
                                          PROP_ICON,
                                          g_param_spec_string  ("icon",
                                                                "Icon",
                                                                "Icon",
                                                                NULL,
-                                                               G_PARAM_READWRITE));
+                                                               G_PARAM_READABLE));
 
 	g_type_class_add_private (object_class, sizeof(EphyBookmarkActionPrivate));
 }
 
 static void
-sync_bookmark_properties (GtkAction *action, EphyNode *bmk)
-{
-	const char *tmp, *location, *icon;
-	char *title;
-	gboolean smart_url;
-	EphyBookmarks *bookmarks;
-	EphyNode *smart_bmks;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	smart_bmks = ephy_bookmarks_get_smart_bookmarks (bookmarks);
-
-	icon = ephy_node_get_property_string
-		(bmk, EPHY_NODE_BMK_PROP_ICON);
-	location = ephy_node_get_property_string
-		(bmk, EPHY_NODE_BMK_PROP_LOCATION);
-	smart_url = ephy_node_has_child (smart_bmks, bmk);
-	tmp = ephy_node_get_property_string
-		(bmk, EPHY_NODE_BMK_PROP_TITLE);
-	title = ephy_string_double_underscores (tmp);
-
-	g_object_set (action,
-		      "label", title,
-		      "location", location,
-		      "smarturl", smart_url,
-		      "icon", icon,
-		      NULL);
-
-	g_free (title);
-}
-
-static void
-bookmarks_child_changed_cb (EphyNode *node,
-			    EphyNode *child,
-			    guint property_id,
-			    GtkAction *action)
-{
-	guint id;
-
-	id = EPHY_BOOKMARK_ACTION (action)->priv->bookmark_id;
-
-	if (id == ephy_node_get_id (child))
-	{
-		sync_bookmark_properties (action, child);
-	}
-}
-
-static void
 smart_child_added_cb (EphyNode *smart_bmks,
 		      EphyNode *child,
 		      EphyBookmarkAction *action)
 {
-	if (action->priv->bookmark_id == ephy_node_get_id (child))
+	if (ephy_node_get_id (action->priv->node) == ephy_node_get_id (child))
 	{
-		g_object_set (action, "smarturl", TRUE, NULL);
+		action->priv->smart_url = TRUE;
+		g_object_notify (G_OBJECT (action), "smarturl");
 	}
 }
 
@@ -936,9 +941,10 @@ smart_child_removed_cb (EphyNode *smart_bmks,
 			guint old_index,
 			EphyBookmarkAction *action)
 {
-	if (action->priv->bookmark_id == ephy_node_get_id (child))
+	if (ephy_node_get_id (action->priv->node) == ephy_node_get_id (child))
 	{
-		g_object_set (action, "smarturl", FALSE, NULL);
+		action->priv->smart_url = FALSE;
+		g_object_notify (G_OBJECT (action), "smarturl");
 	}
 }
 
@@ -950,18 +956,11 @@ ephy_bookmark_action_init (EphyBookmarkAction *action)
 
 	action->priv = EPHY_BOOKMARK_ACTION_GET_PRIVATE (action);
 
-	action->priv->location = NULL;
-	action->priv->icon = NULL;
 	action->priv->prop_dialog = NULL;
 	action->priv->cache_handler = 0;
 	action->priv->motion_handler = 0;
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	node = ephy_bookmarks_get_bookmarks (bookmarks);
-	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_CHANGED,
-				         (EphyNodeCallback) bookmarks_child_changed_cb,
-				         G_OBJECT (action));
-
 	node = ephy_bookmarks_get_smart_bookmarks (bookmarks);
 	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_ADDED,
 					 (EphyNodeCallback) smart_child_added_cb,
@@ -972,23 +971,13 @@ ephy_bookmark_action_init (EphyBookmarkAction *action)
 }
 
 GtkAction *
-ephy_bookmark_action_new (const char *name, guint id)
+ephy_bookmark_action_new (const char *name,
+			  EphyNode *node)
 {
-	EphyNode *bmk;
-	EphyBookmarks *bookmarks;
-	GtkAction *action;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-
-	bmk = ephy_bookmarks_get_from_id (bookmarks, id);
-	g_return_val_if_fail (bmk != NULL, NULL);
-
-	action =  GTK_ACTION (g_object_new (EPHY_TYPE_BOOKMARK_ACTION,
-				            "name", name,
-					    "bookmark_id", id,
-					    NULL));
-
-	sync_bookmark_properties (action, bmk);
+	g_return_val_if_fail (node != NULL, NULL);
 
-	return action;
+	return g_object_new (EPHY_TYPE_BOOKMARK_ACTION,
+			     "name", name,
+			     "bookmark", node,
+			     NULL);
 }
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index 8a4cd9e61..0866e1889 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -23,6 +23,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkaction.h>
+#include "ephy-node.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))
@@ -57,6 +58,6 @@ struct _EphyBookmarkActionClass
 GType      ephy_bookmark_action_get_type	(void);
 
 GtkAction *ephy_bookmark_action_new		(const char *name,
-						 guint id);
+						 EphyNode *node);
 
 #endif
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index ee76e5f98..2ffcd994d 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -183,7 +183,7 @@ add_action_for_bookmark (EphyBookmarksMenu *menu,
 	g_snprintf (verb, sizeof (verb), BMK_VERB_FORMAT, id);
 	g_snprintf (apath, sizeof (apath), BMK_ACCEL_PATH_PREFIX "%s", verb);
 
-	action = ephy_bookmark_action_new (verb, id);
+	action = ephy_bookmark_action_new (verb, bmk);
 
 	gtk_action_set_accel_path (action, apath);
 
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index 91026bd71..c143e6bc9 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -232,14 +232,14 @@ ephy_bookmarksbar_action_request (EggEditableToolbar *eggtoolbar,
 
 		if (ephy_node_has_child (topics, node))
 		{
-			action = ephy_topic_action_new (name, ephy_node_get_id (node));
+			action = ephy_topic_action_new (name, node);
 
 			g_signal_connect (action, "open_in_tabs",
 					  G_CALLBACK (open_in_tabs_cb), toolbar);
 		}
 		else if (ephy_node_has_child (bmks, node))
 		{
-			action = ephy_bookmark_action_new (name, ephy_node_get_id (node));
+			action = ephy_bookmark_action_new (name, node);
 		}
 
 		g_return_if_fail (action != NULL);
diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c
index 6dedfde1b..5b42cca94 100644
--- a/src/bookmarks/ephy-favorites-menu.c
+++ b/src/bookmarks/ephy-favorites-menu.c
@@ -144,8 +144,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *menu)
 
 		node = g_ptr_array_index (children, i);
 
-		action = ephy_bookmark_action_new (verb,
-						   ephy_node_get_id (node));
+		action = ephy_bookmark_action_new (verb, node);
 		gtk_action_set_accel_path (action, accel_path);
 		gtk_action_group_add_action (p->action_group, action);
 		g_object_unref (action);
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index c002377f5..f8efa869e 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -50,9 +50,8 @@ static GtkTargetEntry drag_targets[] =
 };
 static int n_drag_targets = G_N_ELEMENTS (drag_targets);
 
-struct EphyTopicActionPrivate
+struct _EphyTopicActionPrivate
 {
-	guint topic_id;
 	EphyNode *topic_node;
 
 	guint motion_handler;
@@ -64,7 +63,7 @@ struct EphyTopicActionPrivate
 enum
 {
 	PROP_0,
-	PROP_TOPIC_ID
+	PROP_TOPIC
 };
 
 enum
@@ -574,7 +573,7 @@ build_topics_menu (EphyTopicAction *action)
 static GtkWidget *
 build_menu (EphyTopicAction *action)
 {
-	if (action->priv->topic_id == BOOKMARKS_NODE_ID)
+	if (ephy_node_get_id (action->priv->topic_node) == BOOKMARKS_NODE_ID)
 	{
 		return build_topics_menu (action);
 	}
@@ -863,17 +862,51 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
 	}
 }
 
+
 static void
-ephy_topic_action_set_topic_id (EphyTopicAction *action, guint id)
+topic_changed_cb (EphyNode *node,
+		  guint property_id,
+		  EphyTopicAction *action)
 {
-	EphyBookmarks *bookmarks;
-	EphyNode *node;
+	if (property_id == EPHY_NODE_KEYWORD_PROP_NAME)
+	{
+		GValue value = { 0, };
+		const char *tmp;
+		char *title;
+		int priority;
 
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	node = ephy_bookmarks_get_from_id (bookmarks, id);
+		priority = ephy_node_get_property_int 
+			(node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
+
+		if (priority == EPHY_NODE_ALL_PRIORITY)
+		{
+			tmp = _("Bookmarks");
+		}
+		else
+		{
+			tmp = ephy_node_get_property_string
+				(node, EPHY_NODE_KEYWORD_PROP_NAME);
+		}
+
+		title = ephy_string_double_underscores (tmp);
+
+		g_value_init(&value, G_TYPE_STRING);
+		g_value_take_string (&value, title);
+		g_object_set_property (G_OBJECT (action), "label", &value);
+		g_value_unset (&value);
+	}
+}
 
+static void
+ephy_topic_action_set_topic (EphyTopicAction *action,
+			     EphyNode *node)
+{
 	action->priv->topic_node = node;
-	action->priv->topic_id = id;
+
+	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));
 }
 
 static void
@@ -888,8 +921,8 @@ ephy_topic_action_set_property (GObject *object,
 
 	switch (prop_id)
 	{
-		case PROP_TOPIC_ID:
-			ephy_topic_action_set_topic_id (topic, g_value_get_int (value));
+		case PROP_TOPIC:
+			ephy_topic_action_set_topic (topic, g_value_get_pointer (value));
 			break;
 	}
 }
@@ -900,16 +933,8 @@ ephy_topic_action_get_property (GObject *object,
                                    GValue *value,
                                    GParamSpec *pspec)
 {
-	EphyTopicAction *bmk;
-
-	bmk = EPHY_TOPIC_ACTION (object);
-
-	switch (prop_id)
-	{
-		case PROP_TOPIC_ID:
-			g_value_set_boolean (value, bmk->priv->topic_id);
-			break;
-	}
+	/* no readable properties */
+	g_return_if_reached ();
 }
 
 static void
@@ -962,95 +987,30 @@ ephy_topic_action_class_init (EphyTopicActionClass *class)
                               1,
 			      G_TYPE_POINTER);
 
-	g_object_class_install_property (object_class,
-                                         PROP_TOPIC_ID,
-                                         g_param_spec_int ("topic_id",
-                                                           "topic_id",
-                                                           "topic_id",
-							   0,
-							   G_MAXINT,
-                                                           0,
-                                                           G_PARAM_READWRITE));
+	g_object_class_install_property
+		(object_class,
+		 PROP_TOPIC,
+		 g_param_spec_pointer ("topic",
+				       "Topic",
+				       "Topic",
+				       G_PARAM_WRITABLE |
+				       G_PARAM_CONSTRUCT_ONLY));
 
 	g_type_class_add_private (object_class, sizeof(EphyTopicActionPrivate));
 }
 
 static void
-sync_topic_properties (GtkAction *action, EphyNode *bmk)
-{
-	const char *tmp;
-	char *title;
-	int priority;
-
-	priority = ephy_node_get_property_int 
-		(bmk, EPHY_NODE_KEYWORD_PROP_PRIORITY);
-
-	if (priority == EPHY_NODE_ALL_PRIORITY)
-	{
-		tmp = _("Bookmarks");
-	}
-	else
-	{
-		tmp = ephy_node_get_property_string
-        	        (bmk, EPHY_NODE_KEYWORD_PROP_NAME);
-	}
-
-	title = ephy_string_double_underscores (tmp);
-
-	g_object_set (action, "label", title, NULL);
-
-	g_free (title);
-}
-
-static void
-topic_child_changed_cb (EphyNode *node,
-			EphyNode *child,
-			guint property_id,
-			GtkAction *action)
-{
-	guint id;
-
-	id = EPHY_TOPIC_ACTION (action)->priv->topic_id;
-
-	if (id == ephy_node_get_id (child))
-	{
-		sync_topic_properties (action, child);
-	}
-}
-
-static void
 ephy_topic_action_init (EphyTopicAction *action)
 {
-	EphyBookmarks *bookmarks;
-	EphyNode *node;
-
 	action->priv = EPHY_TOPIC_ACTION_GET_PRIVATE (action);
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-	node = ephy_bookmarks_get_keywords (bookmarks);
-	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_CHANGED,
-				         (EphyNodeCallback) topic_child_changed_cb,
-				         G_OBJECT (action));
 }
 
 GtkAction *
-ephy_topic_action_new (const char *name, guint id)
+ephy_topic_action_new (const char *name,
+		       EphyNode *node)
 {
-	EphyNode *bmk;
-	EphyBookmarks *bookmarks;
-	GtkAction *action;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
-
-	bmk = ephy_bookmarks_get_from_id (bookmarks, id);
-	g_return_val_if_fail (bmk != NULL, NULL);
-
-	action = GTK_ACTION (g_object_new (EPHY_TYPE_TOPIC_ACTION,
-					   "topic_id", id,
-					   "name", name,
-					   NULL));
-
-	sync_topic_properties (action, bmk);
-
-	return action;
+	return g_object_new (EPHY_TYPE_TOPIC_ACTION,
+			     "name", name,
+			     "topic", node,
+			     NULL);
 }
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index fa04e2d06..7735fb31c 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -24,6 +24,8 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkaction.h>
 
+#include "ephy-node.h"
+
 #define EPHY_TYPE_TOPIC_ACTION            (ephy_topic_action_get_type ())
 #define EPHY_TOPIC_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_TOPIC_ACTION, EphyTopicAction))
 #define EPHY_TOPIC_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
@@ -31,9 +33,9 @@
 #define EPHY_IS_TOPIC_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_TOPIC_ACTION))
 #define EPHY_TOPIC_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
 
-typedef struct _EphyTopicAction       EphyTopicAction;
-typedef struct _EphyTopicActionClass  EphyTopicActionClass;
-typedef struct EphyTopicActionPrivate EphyTopicActionPrivate;
+typedef struct _EphyTopicAction		EphyTopicAction;
+typedef struct _EphyTopicActionClass	EphyTopicActionClass;
+typedef struct _EphyTopicActionPrivate	EphyTopicActionPrivate;
 
 struct _EphyTopicAction
 {
@@ -59,6 +61,6 @@ struct _EphyTopicActionClass
 GType      ephy_topic_action_get_type	(void);
 
 GtkAction *ephy_topic_action_new	(const char *name,
-					 guint id);
+					 EphyNode *node);
 
 #endif