tracker r1438 - in branches/indexer-split: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed May 14 16:43:43 2008
New Revision: 1438
URL: http://svn.gnome.org/viewvc/tracker?rev=1438&view=rev

Log:
        * src/trackerd/tracker-dbus.c: Corrected a GStrv to be NULL terminated
        * src/trackerd/tracker-db-sqlite.c: Corrected tracker->index_db to be
        the one which as the ATTACH statements don



Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-dbus.c

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Wed May 14 16:43:43 2008
@@ -972,7 +972,9 @@
 	DBConnection *emails_db_con= NULL;
 	Indexer *email_word_index_db_con= NULL;
 
-	db_con = tracker_db_connect_file_meta ();
+	db_con = tracker_db_connect ();
+
+	// db_con = tracker_db_connect_file_meta ();
 	emails_db_con = tracker_db_connect_email_meta ();
 
 	blob_db_con = tracker_db_connect_file_content ();

Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c	Wed May 14 16:43:43 2008
@@ -345,13 +345,14 @@
 		gint     i = 0;
 
                 rows = tracker_db_result_set_get_n_rows (result_set);
-		strv = g_new (gchar*, rows);
+		strv = g_new (gchar*, rows + 1);
 		
 		while (valid) {
 			tracker_db_result_set_get (result_set, 0, &strv[i], -1);
 			valid = tracker_db_result_set_iter_next (result_set);
 			i++;
 		}
+		strv[i] = NULL;
 	}
 
         if (count) {