tracker r1652 - in branches/xesam-support: . src/libtracker-common src/libtracker-db src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Jun 12 11:14:44 2008
New Revision: 1652
URL: http://svn.gnome.org/viewvc/tracker?rev=1652&view=rev

Log:
2008-06-12  Philip Van Hoof  <pvanhoof gnome org>

	* svn merge -r 1644:1651 ../indexer-split



Added:
   branches/xesam-support/Makefile.decl
      - copied unchanged from r1651, /branches/indexer-split/Makefile.decl
Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/configure.ac
   branches/xesam-support/src/libtracker-common/tracker-ontology.c
   branches/xesam-support/src/libtracker-db/tracker-db-manager.c
   branches/xesam-support/src/trackerd/tracker-crawler.c

Modified: branches/xesam-support/configure.ac
==============================================================================
--- branches/xesam-support/configure.ac	(original)
+++ branches/xesam-support/configure.ac	Thu Jun 12 11:14:44 2008
@@ -208,6 +208,45 @@
 IT_PROG_INTLTOOL([0.35.0])
 
 ####################################################################
+# Check if glib includes GTests framework
+#
+# If glib is installed in a non-standard location (like /opt/xxx):
+# * PKG_CONFIG_PATH must be set correctly
+# * glib binaries must be in the PATH (i.e PATH=$PATH:/opt/xxx/bin)
+####################################################################
+GLIB_WITH_UNIT_TESTING=2.15.0
+
+AC_ARG_ENABLE(unit_tests, 
+	AS_HELP_STRING([--enable-unit-tests=@<:@no/yes/auto@:>@],
+			[Enable unit tests (if available)]), , 
+			[enable_unit_tests=auto])
+
+if test "x$enable_unit_tests" != "xno" ; then
+   glib_pkgconfig_tmp="glib-2.0 >= $GLIB_WITH_UNIT_TESTING"
+   PKG_CHECK_MODULES(GLIB_UNIT_TEST, $glib_pkgconfig_tmp, [have_unit_tests=yes], [have_unit_tests=no])
+
+   if test "x$have_unit_tests" = "xyes" ; then
+      AC_DEFINE(HAVE_UNIT_TEST, 1, [Unit test framework available in glib])
+      glib_pkgconfig=$glib_pkgconfig_tmp 
+      AC_PATH_PROG(GTESTER, [gtester], [no] )
+      if test "x$GTESTER" = "xno" ; then
+	 AC_MSG_ERROR([*** Gtester is not in the path])
+      fi
+   fi
+else
+   have_unit_tests=no
+   glib_pkgconfig=
+fi
+
+if test "x$enable_unit_tests" = "xyes"; then
+   if test "x$have_unit_tests" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find unit test compatible glib.])
+   fi
+fi
+
+AM_CONDITIONAL(HAVE_UNIT_TESTS, test "x$have_unit_tests" = "xyes")
+
+####################################################################
 # External QDBM check
 ####################################################################
 
@@ -710,7 +749,7 @@
 
 	enable warnings:			$enable_warnings
 	enable debug symbols:    		$enable_debug_code
-
+	enable unit tests:			$have_unit_tests
 	enable unac accent stripper:	  	$enable_unac
 
 	support for file monitoring:           	gio

Modified: branches/xesam-support/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/xesam-support/src/libtracker-common/tracker-ontology.c	(original)
+++ branches/xesam-support/src/libtracker-common/tracker-ontology.c	Thu Jun 12 11:14:44 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/xesam-support/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-manager.c	Thu Jun 12 11:14:44 2008
@@ -943,6 +943,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;
 }
 
@@ -1535,6 +1539,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",

Modified: branches/xesam-support/src/trackerd/tracker-crawler.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-crawler.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-crawler.c	Thu Jun 12 11:14:44 2008
@@ -746,8 +746,8 @@
 		get_remote_roots (crawler, NULL, NULL);
 	}
 
-	path = "/home/martyn/Documents";
-	/* path = g_get_home_dir (); */
+	/* path = "/home/martyn/Documents"; */
+	path = g_get_home_dir (); 
 
 	file = g_file_new_for_path (path);