[tracker] Use g_hash_table_unref() instead of _destroy()



commit fe5913edd788ec48c447965f10fc4bc77f94f4ca
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 2 15:17:37 2009 +0100

    Use g_hash_table_unref() instead of _destroy()

 src/libtracker-db/tracker-db-interface-sqlite.c  |    7 +++++--
 src/libtracker-miner/tracker-crawler.c           |    2 +-
 src/libtracker-miner/tracker-miner.c             |    4 ++--
 src/plugins/evolution/tracker-evolution-plugin.c |    6 +++---
 src/tracker-extract/tracker-extract-mplayer.c    |    6 ++++--
 src/tracker-miner-fs/tracker-miner-files.c       |    2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index 3735f63..c879cff 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -260,8 +260,11 @@ tracker_db_interface_sqlite_get_property (GObject    *object,
 static void
 close_database (TrackerDBInterfaceSqlitePrivate *priv)
 {
-	g_hash_table_destroy (priv->dynamic_statements);
-	g_hash_table_destroy (priv->statements);
+	g_hash_table_unref (priv->dynamic_statements);
+	priv->dynamic_statements = NULL;
+
+	g_hash_table_unref (priv->statements);
+	priv->statements = NULL;
 
 	g_slist_foreach (priv->function_data, (GFunc) g_free, NULL);
 	g_slist_free (priv->function_data);
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index 264553a..45e1d9b 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -480,7 +480,7 @@ enumerator_data_free (EnumeratorData *ed)
 {
 	g_object_unref (ed->parent);
 	g_object_unref (ed->crawler);
-	g_hash_table_destroy (ed->children);
+	g_hash_table_unref (ed->children);
 	g_slice_free (EnumeratorData, ed);
 }
 
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index bcfb4cf..2a390d8 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -308,7 +308,7 @@ miner_finalize (GObject *object)
 		g_object_set_qdata (G_OBJECT (miner), dbus_data, NULL);
 	}
 
-	g_hash_table_destroy (miner->private->pauses);
+	g_hash_table_unref (miner->private->pauses);
 
 	G_OBJECT_CLASS (tracker_miner_parent_class)->finalize (object);
 }
@@ -489,7 +489,7 @@ dbus_data_destroy (gpointer data)
 	}
 
 	if (dd->name_monitors) {
-		g_hash_table_destroy (dd->name_monitors);
+		g_hash_table_unref (dd->name_monitors);
 	}
 
 	g_slice_free (DBusData, dd);
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 05b76fb..3e06fe5 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -2095,14 +2095,14 @@ tracker_evolution_plugin_finalize (GObject *plugin)
 	g_static_rec_mutex_lock (priv->mutex);
 
 	if (priv->registered_folders) {
-		g_hash_table_destroy (priv->registered_folders);
-		g_hash_table_destroy (priv->cached_folders);
+		g_hash_table_unref (priv->registered_folders);
+		g_hash_table_unref (priv->cached_folders);
 		priv->cached_folders = NULL;
 		priv->registered_folders = NULL;
 	}
 
 	if (priv->registered_stores) {
-		g_hash_table_destroy (priv->registered_stores);
+		g_hash_table_unref (priv->registered_stores);
 		priv->registered_stores = NULL;
 	}
 
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index cceb4ee..3523c78 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -263,7 +263,8 @@ extract_mplayer (const gchar *uri,
 				g_hash_table_foreach (tmp_metadata_video, 
 						      copy_hash_table_entry, 
 						      &info);
-				g_hash_table_destroy (tmp_metadata_video);
+				g_hash_table_unref (tmp_metadata_video);
+				tmp_metadata_video = NULL;
 			}
 
 			if (duration) {
@@ -285,7 +286,8 @@ extract_mplayer (const gchar *uri,
 				g_hash_table_foreach (tmp_metadata_audio, 
 						      copy_hash_table_entry, 
 						      &info);
-				g_hash_table_destroy (tmp_metadata_audio);
+				g_hash_table_unref (tmp_metadata_audio);
+				tmp_metadata_audio = NULL;
 			}
 
 			if (duration) {
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 1b314ac..4861a4c 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -611,7 +611,7 @@ init_mount_points (TrackerMinerFiles *miner)
 	}
 
 	g_string_free (accumulator, TRUE);
-	g_hash_table_destroy (volumes);
+	g_hash_table_unref (volumes);
 }
 
 #ifdef HAVE_HAL



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]