[tracker] libtracker-common: Use GSList for tracker-storage* API

[Martyn James Russell <mr src gnome org>]

commit 78abd4595ad83f2f7cf51f9de7771e61b6990384
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Oct 8 16:34:00 2009 +0100

    libtracker-common: Use GSList for tracker-storage* API

 src/libtracker-common/tracker-storage-hal.c |   38 +++++++++++++++-----------
 src/libtracker-common/tracker-storage.h     |    6 ++--
 src/tracker-extract/tracker-albumart.c      |   10 +++---
 src/tracker-miner-fs/tracker-miner-files.c  |   14 +++++----
 src/tracker-store/tracker-main.c            |    2 +-
 5 files changed, 39 insertions(+), 31 deletions(-)
---
diff --git a/src/libtracker-common/tracker-storage-hal.c b/src/libtracker-common/tracker-storage-hal.c
index beed411..75091da 100644
--- a/src/libtracker-common/tracker-storage-hal.c
+++ b/src/libtracker-common/tracker-storage-hal.c
@@ -66,7 +66,7 @@ typedef struct {
 
 typedef struct {
 	LibHalContext *context;
-	GList	      *roots;
+	GSList	      *roots;
 	gboolean       only_removable;
 } GetRoots;
 
@@ -842,7 +842,7 @@ hal_get_mount_point_by_udi_foreach (gpointer key,
 	info = node->data;
 
 	if (!gr->only_removable || info->removable) {
-		gr->roots = g_list_prepend (gr->roots, g_strdup (info->mount_point));
+		gr->roots = g_slist_prepend (gr->roots, g_strdup (info->mount_point));
 	}
 }
 
@@ -850,12 +850,15 @@ hal_get_mount_point_by_udi_foreach (gpointer key,
  * tracker_storage_get_mounted_directory_roots:
  * @storage: A #TrackerStorage
  *
- * Returns a #Glist of strings containing the root directories for mounted devices.
- * Each element must be freed using g_free() and the list itself using g_list_free().
+ * Returns a #GSList of strings containing the root directories for
+ * mounted devices. 
+ *
+ * Each element must be freed using g_free() and the list itself using
+ * g_slist_free().
  *
  * Returns: The list of root directories.
  **/
-GList *
+GSList *
 tracker_storage_get_mounted_directory_roots (TrackerStorage *storage)
 {
 	TrackerStoragePriv *priv;
@@ -873,19 +876,22 @@ tracker_storage_get_mounted_directory_roots (TrackerStorage *storage)
 			      hal_get_mount_point_by_udi_foreach,
 			      &gr);
 
-	return g_list_reverse (gr.roots);
+	return g_slist_reverse (gr.roots);
 }
 
 /**
  * tracker_storage_get_removable_device_roots:
  * @storage: A #TrackerStorage
  *
- * Returns a #GList of strings containing the root directories for removable devices.
- * Each element must be freed using g_free() and the list itself through g_list_free().
+ * Returns a #GSList of strings containing the root directories for
+ * removable devices. 
+ *
+ * Each element must be freed using g_free() and the list itself
+ * through g_slist_free().
  *
  * Returns: The list of root directories.
  **/
-GList *
+GSList *
 tracker_storage_get_removable_device_roots (TrackerStorage *storage)
 {
 	TrackerStoragePriv *priv;
@@ -903,7 +909,7 @@ tracker_storage_get_removable_device_roots (TrackerStorage *storage)
 			      hal_get_mount_point_by_udi_foreach,
 			      &gr);
 
-	return g_list_reverse (gr.roots);
+	return g_slist_reverse (gr.roots);
 }
 
 /**
@@ -974,19 +980,19 @@ tracker_storage_uri_is_on_removable_device (TrackerStorage *storage,
  * tracker_storage_get_removable_device_udis:
  * @storage: A #TrackerStorage
  *
- * Returns a #GList of strings containing the UDI for removable devices.
+ * Returns a #GSList of strings containing the UDI for removable devices.
  * Each element is owned by the #GHashTable internally, the list
- * itself through should be freed using g_list_free().
+ * itself through should be freed using g_slist_free().
  *
  * Returns: The list of UDIs.
  **/
-GList *
+GSList *
 tracker_storage_get_removable_device_udis (TrackerStorage *storage)
 {
 	TrackerStoragePriv *priv;
 	GHashTableIter iter;
 	gpointer key, value;
-	GList *udis;
+	GSList *udis;
 
 	g_return_val_if_fail (TRACKER_IS_STORAGE (storage), NULL);
 
@@ -1006,11 +1012,11 @@ tracker_storage_get_removable_device_udis (TrackerStorage *storage)
 		info = node->data;
 
 		if (info->removable) {
-			udis = g_list_prepend (udis, (gpointer) udi);
+			udis = g_slist_prepend (udis, (gpointer) udi);
 		}
 	}
 
-	return g_list_reverse (udis);
+	return g_slist_reverse (udis);
 }
 
 /**
diff --git a/src/libtracker-common/tracker-storage.h b/src/libtracker-common/tracker-storage.h
index 976c961..134ea2c 100644
--- a/src/libtracker-common/tracker-storage.h
+++ b/src/libtracker-common/tracker-storage.h
@@ -52,9 +52,9 @@ struct _TrackerStorageClass {
 
 GType	        tracker_storage_get_type		    (void) G_GNUC_CONST;
 TrackerStorage *tracker_storage_new                         (void);
-GList *         tracker_storage_get_mounted_directory_roots (TrackerStorage  *storage);
-GList *         tracker_storage_get_removable_device_roots  (TrackerStorage  *storage);
-GList *         tracker_storage_get_removable_device_udis   (TrackerStorage  *storage);
+GSList *        tracker_storage_get_mounted_directory_roots (TrackerStorage  *storage);
+GSList *        tracker_storage_get_removable_device_roots  (TrackerStorage  *storage);
+GSList *        tracker_storage_get_removable_device_udis   (TrackerStorage  *storage);
 const gchar *   tracker_storage_udi_get_mount_point         (TrackerStorage  *storage,
 							     const gchar     *udi);
 gboolean        tracker_storage_udi_get_is_mounted          (TrackerStorage  *storage,
diff --git a/src/tracker-extract/tracker-albumart.c b/src/tracker-extract/tracker-albumart.c
index 0ae0a35..3fa2b35 100644
--- a/src/tracker-extract/tracker-albumart.c
+++ b/src/tracker-extract/tracker-albumart.c
@@ -776,7 +776,7 @@ albumart_copy_to_local (TrackerStorage *hal,
 			const gchar    *filename, 
 			const gchar    *local_uri)
 {
-	GList *removable_roots, *l;
+	GSList *removable_roots, *l;
 	gboolean on_removable_device = FALSE;
 	guint flen;
 
@@ -792,8 +792,8 @@ albumart_copy_to_local (TrackerStorage *hal,
 
 	removable_roots = tracker_storage_get_removable_device_roots (hal);
 #else
-	removable_roots = g_list_append (removable_roots, "/media");
-	removable_roots = g_list_append (removable_roots, "/mnt");
+	removable_roots = g_slist_append (removable_roots, "/media");
+	removable_roots = g_slist_append (removable_roots, "/mnt");
 #endif
 
 	flen = strlen (filename);
@@ -810,10 +810,10 @@ albumart_copy_to_local (TrackerStorage *hal,
 	}
 
 #ifdef HAVE_HAL
-	g_list_foreach (removable_roots, (GFunc) g_free, NULL);
+	g_slist_foreach (removable_roots, (GFunc) g_free, NULL);
 #endif
 
-	g_list_free (removable_roots);
+	g_slist_free (removable_roots);
 
 	if (on_removable_device) {
 		GFile *local_file, *from;
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 0a5913d..cde6de9 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -501,7 +501,7 @@ init_mount_points (TrackerMinerFiles *miner)
 	GString *accumulator;
 	gint i;
 #ifdef HAVE_HAL
-	GList *udis, *u;
+	GSList *udis, *u;
 #endif
 
 	priv = TRACKER_MINER_FILES_GET_PRIVATE (miner);
@@ -562,7 +562,7 @@ init_mount_points (TrackerMinerFiles *miner)
 		g_hash_table_replace (volumes, removable_device_urn, GINT_TO_POINTER (state));
 	}
 
-	g_list_free (udis);
+	g_slist_free (udis);
 #endif
 
 	accumulator = g_string_new (NULL);
@@ -611,6 +611,7 @@ init_mount_points (TrackerMinerFiles *miner)
 }
 
 #ifdef HAVE_HAL
+
 static void
 mount_point_removed_cb (TrackerStorage *storage,
 			const gchar    *udi,
@@ -669,16 +670,17 @@ initialize_removable_devices (TrackerMinerFiles *mf)
         priv = TRACKER_MINER_FILES_GET_PRIVATE (mf);
 
         if (tracker_config_get_index_removable_devices (priv->config)) {
-                GList *mounts, *m;
+                GSList *mounts, *m;
 
                 mounts = tracker_storage_get_removable_device_roots (priv->storage);
 
                 for (m = mounts; m; m = m->next) {
-			GFile *as_file = g_file_new_for_path (m->data);
+			GFile *file = g_file_new_for_path (m->data);
+
 			tracker_miner_fs_add_directory (TRACKER_MINER_FS (mf),
-							as_file, 
+							file, 
 							TRUE);
-			g_object_unref (as_file);
+			g_object_unref (file);
                 }
         }
 }
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 336f0c7..f43a801 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -542,7 +542,7 @@ set_up_mount_points (TrackerStorage *hal)
 
 	TrackerMainPrivate *private;
 	GError *error = NULL;
-	GList *roots, *l;
+	GSList *roots, *l;
 
 	private = g_static_private_get (&private_key);