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, 15 insertions, 11 deletions

diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index d6413ff76..90d06883c 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -21,7 +21,7 @@
 
 #include "ephy-state.h"
 #include "ephy-file-helpers.h"
-#include "ephy-node.h"
+#include "ephy-node-db.h"
 #include "ephy-types.h"
 #include "ephy-node-common.h"
 
@@ -43,6 +43,7 @@ enum
 };
 
 static EphyNode *states = NULL;
+static EphyNodeDb *states_db = NULL;
 
 static void
 ephy_states_load (void)
@@ -67,7 +68,7 @@ ephy_states_load (void)
 	{
 		EphyNode *node;
 
-		node = ephy_node_new_from_xml (child);
+		node = ephy_node_new_from_xml (states_db, child);
 	}
 
 	xmlFreeDoc (doc);
@@ -144,7 +145,8 @@ ensure_states (void)
 {
 	if (states == NULL)
 	{
-		states = ephy_node_new_with_id (STATES_NODE_ID);
+		states_db = ephy_node_db_new ("EphyStates");
+		states = ephy_node_new_with_id (states_db, STATES_NODE_ID);
 		ephy_states_load ();
 	}
 }
@@ -315,7 +317,7 @@ ephy_state_add_window (GtkWidget *window,
 	{
 		GValue value = { 0, };
 
-		node = ephy_node_new ();
+		node = ephy_node_new (states_db);
 		ephy_node_add_child (states, node);
 
 		g_value_init (&value, G_TYPE_STRING);
@@ -369,10 +371,10 @@ ephy_state_add_window (GtkWidget *window,
 		ephy_state_window_set_position (window, node);
 	}
 
-	g_signal_connect_object (window, "configure_event",
-			         G_CALLBACK (window_configure_event_cb), node, 0);
-	g_signal_connect_object (window, "window_state_event",
-			         G_CALLBACK (window_state_event_cb), node, 0);
+	g_signal_connect (window, "configure_event",
+			  G_CALLBACK (window_configure_event_cb), node);
+	g_signal_connect (window, "window_state_event",
+			  G_CALLBACK (window_state_event_cb), node);
 }
 
 static gboolean
@@ -409,7 +411,7 @@ ephy_state_add_paned (GtkWidget *paned,
 	{
 		GValue value = { 0, };
 
-		node = ephy_node_new ();
+		node = ephy_node_new (states_db);
 		ephy_node_add_child (states, node);
 
 		g_value_init (&value, G_TYPE_STRING);
@@ -428,8 +430,8 @@ ephy_state_add_paned (GtkWidget *paned,
 	width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH);
 	gtk_paned_set_position (GTK_PANED (paned), width);
 
-	g_signal_connect_object (paned, "size_allocate",
-			         G_CALLBACK (paned_size_allocate_cb), node, 0);
+	g_signal_connect (paned, "size_allocate",
+			  G_CALLBACK (paned_size_allocate_cb), node);
 }
 
 void
@@ -437,5 +439,7 @@ ephy_state_save (void)
 {
 	ephy_states_save ();
 	ephy_node_unref (states);
+	g_object_unref (states_db);
 	states = NULL;
+	states_db = NULL;
 }