tracker r1784 - in branches/indexer-split: . data/modules src/libtracker-common

[mr svn gnome org]

Author: mr
Date: Thu Jun 26 16:33:53 2008
New Revision: 1784
URL: http://svn.gnome.org/viewvc/tracker?rev=1784&view=rev

Log:
	* data/modules/applications.xml:
	* data/modules/files.xml:
	* data/modules/gaim-conversations.xml: Use "true" not "True",
	breaks the GKeyFile.

	* src/libtracker-common/tracker-module-config.c: Don't set the
	modules to NULL and set GError to NULL before using it.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/modules/applications.xml
   branches/indexer-split/data/modules/files.xml
   branches/indexer-split/data/modules/gaim-conversations.xml
   branches/indexer-split/src/libtracker-common/tracker-module-config.c

Modified: branches/indexer-split/data/modules/applications.xml
==============================================================================
--- branches/indexer-split/data/modules/applications.xml	(original)
+++ branches/indexer-split/data/modules/applications.xml	Thu Jun 26 16:33:53 2008
@@ -1,6 +1,6 @@
 [General]
 Description=Applications
-Enabled=True
+Enabled=true
 
 [Monitors]
 Directories=

Modified: branches/indexer-split/data/modules/files.xml
==============================================================================
--- branches/indexer-split/data/modules/files.xml	(original)
+++ branches/indexer-split/data/modules/files.xml	Thu Jun 26 16:33:53 2008
@@ -1,6 +1,6 @@
 [General]
 Description=Files
-Enabled=True
+Enabled=true
 
 [Monitors]
 Directories=

Modified: branches/indexer-split/data/modules/gaim-conversations.xml
==============================================================================
--- branches/indexer-split/data/modules/gaim-conversations.xml	(original)
+++ branches/indexer-split/data/modules/gaim-conversations.xml	Thu Jun 26 16:33:53 2008
@@ -1,6 +1,6 @@
 [General]
 Description=GAIM Conversations
-Enabled=True
+Enabled=true
 
 [Monitors]
 Directories=

Modified: branches/indexer-split/src/libtracker-common/tracker-module-config.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-module-config.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-module-config.c	Thu Jun 26 16:33:53 2008
@@ -178,7 +178,7 @@
 module_config_load_file (const gchar *filename)
 {
 	GKeyFile     *key_file;
-	GError       *error;
+	GError       *error = NULL;
 	ModuleConfig *mc;
 
 	key_file = g_key_file_new ();
@@ -261,8 +261,6 @@
 	gchar           *filename;
 	const gchar     *name;
 
-	g_message ("Loading module config..."); 
-
 	path = module_config_get_directory ();
 	file = g_file_new_for_path (path);
 
@@ -285,8 +283,6 @@
 		return FALSE;
 	}
 
-	modules = NULL;
-
 	/* We should probably do this async */ 
 	for (info = g_file_enumerator_next_file (enumerator, NULL, &error);
 	     info && !error;