aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-bookmark-factory-action.c4
-rw-r--r--src/bookmarks/ephy-topic-factory-action.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e1444f3b3..c841e69fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-02-12 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmark-factory-action.c:
+ (build_menu_for_topic):
+ * src/bookmarks/ephy-topic-factory-action.c: (build_menu):
+
+ Strdup the action name data.
+
+2006-02-12 Christian Persch <chpe@cvs.gnome.org>
+
* src/bookmarks/ephy-open-tabs-action.c: (node_added_cb),
(node_removed_cb):
diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c
index 43c4683a0..8d684afa1 100644
--- a/src/bookmarks/ephy-bookmark-factory-action.c
+++ b/src/bookmarks/ephy-bookmark-factory-action.c
@@ -123,7 +123,9 @@ build_menu_for_topic (GtkWidget *placeholder, EggToolbarsModel *model, EphyNode
name = ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_TITLE);
item = gtk_menu_item_new_with_label (name);
- g_object_set_data_full (G_OBJECT (item), "ephy-action", (gpointer) action, g_free);
+ /* FIXME: set the |node| instead here! */
+ g_object_set_data_full (G_OBJECT (item), "ephy-action",
+ g_strdup (action), g_free);
g_signal_connect (item, "activate", G_CALLBACK (activate_item_cb), placeholder);
gtk_widget_show (item);
diff --git a/src/bookmarks/ephy-topic-factory-action.c b/src/bookmarks/ephy-topic-factory-action.c
index cb202c65c..16f6d1732 100644
--- a/src/bookmarks/ephy-topic-factory-action.c
+++ b/src/bookmarks/ephy-topic-factory-action.c
@@ -179,7 +179,9 @@ build_menu (GtkWidget *placeholder, EggToolbarsModel *model)
name = ephy_node_get_property_string (node, EPHY_NODE_KEYWORD_PROP_NAME);
item = gtk_menu_item_new_with_label (name);
- g_object_set_data_full (G_OBJECT (item), "ephy-action", (gpointer) action, g_free);
+ /* FIXME: set the |node| instead here! */
+ g_object_set_data_full (G_OBJECT (item), "ephy-action",
+ g_strdup (action), g_free);
g_signal_connect (item, "activate", G_CALLBACK (activate_item_cb), placeholder);
gtk_widget_show (item);