tracker r1650 - in branches/indexer-split: . src/libtracker-common src/libtracker-db

[carlosg svn gnome org]

Author: carlosg
Date: Thu Jun 12 10:14:51 2008
New Revision: 1650
URL: http://svn.gnome.org/viewvc/tracker?rev=1650&view=rev

Log:
2008-06-12  Carlos Garnacho  <carlos imendio com>

        * src/libtracker-db/tracker-db-manager.c (db_get_static_data)
        (db_row_to_service): Plug a few leaks
        * src/libtracker-common/tracker-ontology.c (tracker_ontology_init):
        Set the GDestroyNotify handler for mime/metadata keys, as these
        hashtables have to take ownership of the strings passed.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-ontology.c
   branches/indexer-split/src/libtracker-db/tracker-db-manager.c

Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c	Thu Jun 12 10:14:51 2008
@@ -117,8 +117,8 @@
 					       g_object_unref);
 	
 	mime_service = g_hash_table_new_full (g_str_hash, 
-					      g_str_equal, 
-					      NULL, 
+					      g_str_equal,
+					      g_free,
 					      NULL);
 
 	service_directory_table = g_hash_table_new_full (g_str_hash, 
@@ -128,7 +128,7 @@
 
 	metadata_table = g_hash_table_new_full (g_str_hash,
 						g_str_equal,
-						NULL, //Pointer to the object name
+						g_free,
 						g_object_unref);
 
 	/* We will need the class later in order to match strings to enum values

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Thu Jun 12 10:14:51 2008
@@ -941,6 +941,10 @@
 	g_slist_foreach (new_list, (GFunc) g_free, NULL);
         g_slist_free (new_list);
 
+	g_free (name);
+	g_free (parent);
+	g_free (content_metadata);
+
         return service;
 }
 
@@ -1432,6 +1436,9 @@
 
 				tracker_field_set_child_ids (def, child_ids);
 				g_object_unref (result_set2);
+
+				g_slist_foreach (child_ids, (GFunc) g_free, NULL);
+				g_slist_free (child_ids);
 			}
 
 			g_message ("Loading metadata def:'%s' with weight:%d",