[tracker/harmattan-pre-signal-updates: 1228/1380] Remove leftovers from scan/cache timeout config options.

[Martyn James Russell <mr src gnome org>]

commit 4630bacd55493908529b05e3fa53ecf7bb6b6332
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Aug 31 14:52:38 2010 +0200

    Remove leftovers from scan/cache timeout config options.

 src/miners/fs/tracker-config.c              |    2 --
 src/miners/fs/tracker-config.h              |    6 ------
 src/tracker-preferences/tracker-config.vapi |    2 --
 src/tracker-store/tracker-store.c           |    1 +
 4 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index fc4a0e1..f81f16d 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -138,8 +138,6 @@ static ObjectToKeyFile conversions[] = {
 	{ G_TYPE_INT,     "initial-sleep",                    GROUP_GENERAL,  "InitialSleep"              },
 	/* Monitors */
 	{ G_TYPE_BOOLEAN, "enable-monitors",                  GROUP_MONITORS, "EnableMonitors"            },
-	{ G_TYPE_INT,     "scan-timeout",                     GROUP_MONITORS, "ScanTimeout"               },
-	{ G_TYPE_INT,     "cache-timeout",                    GROUP_MONITORS, "CacheTimeout"              },
 	/* Indexing */
 	{ G_TYPE_INT,     "throttle",                         GROUP_INDEXING, "Throttle"                  },
 	{ G_TYPE_BOOLEAN, "index-on-battery",                 GROUP_INDEXING, "IndexOnBattery"            },
diff --git a/src/miners/fs/tracker-config.h b/src/miners/fs/tracker-config.h
index 6599c51..bc696f6 100644
--- a/src/miners/fs/tracker-config.h
+++ b/src/miners/fs/tracker-config.h
@@ -54,8 +54,6 @@ gboolean       tracker_config_save                                 (TrackerConfi
 gint           tracker_config_get_verbosity                        (TrackerConfig *config);
 gint           tracker_config_get_initial_sleep                    (TrackerConfig *config);
 gboolean       tracker_config_get_enable_monitors                  (TrackerConfig *config);
-gint           tracker_config_get_scan_timeout                     (TrackerConfig *config);
-gint           tracker_config_get_cache_timeout                    (TrackerConfig *config);
 gint           tracker_config_get_throttle                         (TrackerConfig *config);
 gboolean       tracker_config_get_index_on_battery                 (TrackerConfig *config);
 gboolean       tracker_config_get_index_on_battery_first_time      (TrackerConfig *config);
@@ -78,10 +76,6 @@ void           tracker_config_set_initial_sleep                    (TrackerConfi
                                                                     gint           value);
 void           tracker_config_set_enable_monitors                  (TrackerConfig *config,
                                                                     gboolean       value);
-void           tracker_config_set_scan_timeout                     (TrackerConfig *config,
-                                                                    gint           value);
-void           tracker_config_set_cache_timeout                    (TrackerConfig *config,
-                                                                    gint           value);
 void           tracker_config_set_throttle                         (TrackerConfig *config,
                                                                     gint           value);
 void           tracker_config_set_index_on_battery                 (TrackerConfig *config,
diff --git a/src/tracker-preferences/tracker-config.vapi b/src/tracker-preferences/tracker-config.vapi
index 3b7d5ef..bcd5047 100644
--- a/src/tracker-preferences/tracker-config.vapi
+++ b/src/tracker-preferences/tracker-config.vapi
@@ -27,8 +27,6 @@ namespace Tracker {
 		public int verbosity { get; set; }
 		public int initial_sleep { get; set; }
 		public bool enable_monitors { get; set; }
-		public int scan_timeout { get; set; }
-		public int cache_timeout { get; set; }
 		public int throttle { get; set; }
 		public bool enable_thumbnails { get; set; }
 		public bool index_on_battery { get; set; }
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 0cfdcff..824e99b 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -426,6 +426,7 @@ tracker_store_init (void)
 
 #ifdef __USE_GNU
         if (g_getenv ("TRACKER_STORE_DISABLE_CPU_AFFINITY") == NULL) {
+		sched_getcpu ();
                 main_cpu = sched_getcpu ();
                 CPU_ZERO (&cpuset);
                 CPU_SET (main_cpu, &cpuset);