[tracker/direct-access: 158/158] Rebase fixes

[Jürg Billeter <juergbi src gnome org>]

commit f3e8b615e6f818097e47ad6b163199c9046f70d3
Author: Jürg Billeter <j bitron ch>
Date:   Thu Aug 5 18:20:11 2010 +0200

    Rebase fixes

 src/libtracker-sparql/Makefile.am |    3 ++-
 src/tracker-store/tracker-store.c |    5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 64c4793..007a248 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -52,7 +52,8 @@ libtracker-sparql.vala.stamp: $(libtracker_sparql_la_VALASOURCES) $(vapi_sources
 	$(AM_V_GEN)touch $@
 
 libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD = 	\
-	$(GLIB2_LIBS)
+	$(GLIB2_LIBS)					\
+	$(GIO_LIBS)
 
 BUILT_SOURCES = 					\
 	libtracker-sparql.vala.stamp
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 9816d50..0cfdcff 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -51,8 +51,8 @@ typedef struct {
 	GQueue      *update_queues[TRACKER_STORE_N_PRIORITIES];
 	guint        n_queries_running;
 	gboolean     update_running;
-	GThreadPool *main_pool;
-	GThreadPool *global_pool;
+	GThreadPool *update_pool;
+	GThreadPool *query_pool;
 	GSList      *running_tasks;
 	guint        watchdog_id;
 	guint        max_task_time;
@@ -689,7 +689,6 @@ void
 tracker_store_set_active (gboolean active)
 {
 	TrackerStorePrivate *private;
-	TrackerStoreTask *task;
 
 	private = g_static_private_get (&private_key);
 	private->active = active;