tracker r2815 - in trunk: . src/libtracker-common

[carlosg svn gnome org]

Author: carlosg
Date: Wed Jan 21 15:35:13 2009
New Revision: 2815
URL: http://svn.gnome.org/viewvc/tracker?rev=2815&view=rev

Log:
2009-01-21  Carlos Garnacho  <carlos imendio com>

        * src/libtracker-common/tracker-module-config.c (load_boolean)
        (load_string) (load_string_list): Do not free the key file on error,
        it will be done afterwards anyway.

        (tracker_module_config_get_monitor_directories)
        (tracker_module_config_get_monitor_recurse_directories)
        (tracker_module_config_get_ignored_directories)
        (tracker_module_config_get_ignored_files)
        (tracker_module_config_get_index_mime_types)
        (tracker_module_config_get_index_files): Return correct types if one
        of the preconditions fails.

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-module-config.c

Modified: trunk/src/libtracker-common/tracker-module-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-module-config.c	(original)
+++ trunk/src/libtracker-common/tracker-module-config.c	Wed Jan 21 15:35:13 2009
@@ -259,7 +259,6 @@
 			   error->message);
 
 		g_error_free (error);
-		g_key_file_free (key_file);
 
 		return FALSE;
 	}
@@ -286,7 +285,6 @@
 			   error->message);
 
 		g_error_free (error);
-		g_key_file_free (key_file);
 
 		return NULL;
 	}
@@ -331,7 +329,6 @@
 			   error->message);
 
 		g_error_free (error);
-		g_key_file_free (key_file);
 
 		return table;
 	}
@@ -692,7 +689,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);
@@ -705,7 +702,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);
@@ -718,7 +715,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);
@@ -731,7 +728,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);
@@ -757,7 +754,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);
@@ -770,7 +767,7 @@
 {
 	ModuleConfig *mc;
 
-	g_return_val_if_fail (name != NULL, FALSE);
+	g_return_val_if_fail (name != NULL, NULL);
 
 	mc = g_hash_table_lookup (modules, name);
 	g_return_val_if_fail (mc, NULL);