Change initial refcound of EphyNode to 1, not 0

6 files changed, 11 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index a746236f1..366c5934d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-09  Adam Hooper  <adamh@cvs.gnome.org>
+
+	* embed/ephy-encodings.c: (ephy_encodings_init):
+	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_init):
+	* embed/ephy-history.c: (ephy_history_init):
+	* lib/ephy-node.c: (ephy_node_new_with_id):
+	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):
+
+	Make ephy-node refcount initialize to 1 and not 0.
+
 2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 36f5ac14b..61b84617f 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -448,10 +448,6 @@ ephy_encodings_init (EphyEncodings *encodings)
 	encodings->priv->encodings = ephy_node_new_with_id (db, ENCODINGS_NODE_ID);
 	encodings->priv->detectors = ephy_node_new_with_id (db, DETECTORS_NODE_ID);
 
-	ephy_node_ref (encodings->priv->root);
-	ephy_node_ref (encodings->priv->encodings);
-	ephy_node_ref (encodings->priv->detectors);
-
 	/* now fill the db */
 	for (i = 0; i < n_encoding_entries; i++)
 	{
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index ecd23339d..1854c6813 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -240,7 +240,6 @@ ephy_favicon_cache_init (EphyFaviconCache *cache)
 
 	/* Icons */
 	cache->priv->icons = ephy_node_new_with_id (db, ICONS_NODE_ID);
-	ephy_node_ref (cache->priv->icons);
 	ephy_node_signal_connect_object (cache->priv->icons,
 					 EPHY_NODE_CHILD_ADDED,
 					 (EphyNodeCallback) icons_added_cb,
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 300c601a0..26ff343b3 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -482,7 +482,6 @@ ephy_history_init (EphyHistory *eb)
 
 	/* Pages */
 	eb->priv->pages = ephy_node_new_with_id (db, PAGES_NODE_ID);
-	ephy_node_ref (eb->priv->pages);
 	g_value_init (&value, G_TYPE_STRING);
 	g_value_set_string (&value, _("All"));
 	ephy_node_set_property (eb->priv->pages,
@@ -513,7 +512,6 @@ ephy_history_init (EphyHistory *eb)
 
 	/* Hosts */
 	eb->priv->hosts = ephy_node_new_with_id (db, HOSTS_NODE_ID);
-	ephy_node_ref (eb->priv->hosts);
 	ephy_node_signal_connect_object (eb->priv->hosts,
 					 EPHY_NODE_CHILD_ADDED,
 				         (EphyNodeCallback) hosts_added_cb,
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index b8d5f8959..087d18fdc 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -318,7 +318,7 @@ ephy_node_new_with_id (EphyNodeDb *db, gulong reserved_id)
 
 	node = g_new0 (EphyNode, 1);
 
-	node->ref_count = 0;
+	node->ref_count = 1;
 
 	node->id = reserved_id;
 
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index d9a0f7b7d..6e765e6d6 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -640,7 +640,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 
 	/* Bookmarks */
 	eb->priv->bookmarks = ephy_node_new_with_id (db, BOOKMARKS_NODE_ID);
-	ephy_node_ref (eb->priv->bookmarks);
 	g_value_init (&value, G_TYPE_STRING);
 	g_value_set_string (&value, _("All"));
 	ephy_node_set_property (eb->priv->bookmarks,
@@ -658,7 +657,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 
 	/* Keywords */
 	eb->priv->keywords = ephy_node_new_with_id (db, KEYWORDS_NODE_ID);
-	ephy_node_ref (eb->priv->keywords);
 	g_value_init (&value, G_TYPE_INT);
 	g_value_set_int (&value, EPHY_NODE_ALL_PRIORITY);
 	ephy_node_set_property (eb->priv->bookmarks,
@@ -675,7 +673,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 
 	/* Favorites */
 	eb->priv->favorites = ephy_node_new_with_id (db, FAVORITES_NODE_ID);
-	ephy_node_ref (eb->priv->favorites);
 	g_value_init (&value, G_TYPE_STRING);
 	g_value_set_string (&value, _("Most Visited"));
 	ephy_node_set_property (eb->priv->favorites,
@@ -692,7 +689,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 
 	/* Not categorized */
 	eb->priv->notcategorized = ephy_node_new_with_id (db, BMKS_NOTCATEGORIZED_NODE_ID);
-	ephy_node_ref (eb->priv->notcategorized);
 	g_value_init (&value, G_TYPE_STRING);
 	g_value_set_string (&value, _("Not Categorized"));
 	ephy_node_set_property (eb->priv->notcategorized,
@@ -709,7 +705,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 
 	/* Smart bookmarks */
 	eb->priv->smartbookmarks = ephy_node_new_with_id (db, SMARTBOOKMARKS_NODE_ID);
-	ephy_node_ref (eb->priv->smartbookmarks);
 
 	if (g_file_test (eb->priv->xml_file, G_FILE_TEST_EXISTS) == FALSE
 	    && g_file_test (eb->priv->rdf_file, G_FILE_TEST_EXISTS) == FALSE)