2003-05-19 Marco Pesenti Gritti <marco@it.gnome.org>

	* lib/Makefile.am:
	* lib/ephy-dnd.c: (ephy_dnd_node_list_extract_nodes):
	* lib/ephy-node.c: (write_lock_to_read_lock),
	(read_lock_to_write_lock), (lock_gdk), (unlock_gdk), (callback),
	(ephy_node_emit_signal), (ephy_node_finalize), (real_remove_child),
	(remove_child), (signal_object_weak_notify),
	(unref_signal_objects), (ephy_node_dispose), (ephy_node_new),
	(ephy_node_new_with_id), (ephy_node_get_id), (ephy_node_ref),
	(ephy_node_unref), (ephy_node_freeze), (ephy_node_thaw),
	(child_changed), (real_set_property), (ephy_node_set_property),
	(ephy_node_get_property), (ephy_node_get_property_string),
	(ephy_node_get_property_boolean), (ephy_node_get_property_long),
	(ephy_node_get_property_int), (ephy_node_get_property_double),
	(ephy_node_get_property_float), (ephy_node_get_property_node),
	(save_parent), (ephy_node_save_to_xml), (real_add_child),
	(ephy_node_new_from_xml), (ephy_node_add_child),
	(ephy_node_remove_child), (ephy_node_has_child),
	(ephy_node_real_get_child_index), (ephy_node_sort_children),
	(ephy_node_reorder_children), (ephy_node_get_children),
	(ephy_node_get_n_children), (ephy_node_get_nth_child),
	(get_child_index_real), (ephy_node_get_child_index),
	(ephy_node_get_next_child), (ephy_node_get_previous_child),
	(ephy_node_signal_connect_object), (ephy_node_signal_disconnect):
	* lib/ephy-node.h:
	* lib/ephy-state.c: (ephy_states_load), (ensure_states),
	(ephy_state_add_window), (ephy_state_add_paned), (ephy_state_save):
	* lib/widgets/ephy-node-view.c: (ephy_node_view_class_init),
	(ephy_node_view_selection_changed_cb),
	(ephy_node_view_set_property), (ephy_node_view_get_property),
	(ephy_node_view_remove):
	* lib/widgets/ephy-tree-model-node.c:
	(ephy_tree_model_node_class_init),
	(ephy_tree_model_node_set_property),
	(ephy_tree_model_node_get_property),
	(ephy_tree_model_node_get_value), (ephy_tree_model_node_get_path),
	(ephy_tree_model_node_iter_next),
	(ephy_tree_model_node_node_from_iter):
	* src/bookmarks/ephy-bookmark-action.c:
	(ephy_bookmark_action_init), (ephy_bookmark_action_new):
	* src/bookmarks/ephy-bookmark-properties.c:
	(ephy_bookmark_properties_class_init),
	(ephy_bookmark_properties_set_property):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(cmd_show_in_bookmarks_bar), (cmd_open_bookmarks_in_tabs),
	(cmd_open_bookmarks_in_browser), (cmd_delete),
	(cmd_bookmark_properties), (cmd_copy),
	(ephy_bookmarks_editor_node_activated_cb),
	(ephy_bookmarks_editor_update_menu),

1 files changed, 4 insertions, 4 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index cbb49007f..8c2862534 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -427,9 +427,9 @@ ephy_bookmark_action_init (EphyBookmarkAction *action)
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 	node = ephy_bookmarks_get_bookmarks (bookmarks);
-	g_signal_connect_object (node, "child_changed",
-				 G_CALLBACK (bookmarks_child_changed_cb),
-				 action, 0);
+	ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_CHANGED,
+				         (EphyNodeCallback) bookmarks_child_changed_cb,
+				         G_OBJECT (action));
 }
 
 EggAction *
@@ -441,7 +441,7 @@ ephy_bookmark_action_new (const char *name, guint id)
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
-	bmk = ephy_node_get_from_id (id);
+	bmk = ephy_bookmarks_get_from_id (bookmarks, id);
 	g_return_val_if_fail (bmk != NULL, NULL);
 
 	action =  EGG_ACTION (g_object_new (EPHY_TYPE_BOOKMARK_ACTION,