[tracker/tracker-0.10] tracker-miner-fs: Detect locale changes properly in userguides miner

[Martyn James Russell <mr src gnome org>]

commit 343771aebd6fa01adb4b014bdae8c935251f8460
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Nov 24 10:50:24 2011 +0000

    tracker-miner-fs: Detect locale changes properly in userguides miner

 src/miners/fs/tracker-main.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index e082988..eaddb59 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -863,19 +863,23 @@ main (gint argc, gchar *argv[])
 		if (!do_mtime_checking)
 			g_debug ("Forcing mtime check in applications miner as locale change was detected");
 		tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_applications), TRUE);
+	} else {
+		tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_applications), do_mtime_checking);
+	}
+
 
 #ifdef HAVE_MAEMO
+	/* If a locale change was detected, always do mtime checks */
+	if (tracker_miner_userguides_detect_locale_changed (miner_userguides)) {
 		if (!do_mtime_checking)
 			g_debug ("Forcing mtime check in userguides miner as locale change was detected");
 		tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_userguides), TRUE);
-#endif /* HAVE_MAEMO */
 	} else {
-		tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_applications), do_mtime_checking);
-#ifdef HAVE_MAEMO
 		tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_userguides), do_mtime_checking);
 #endif /* HAVE_MAEMO */
 	}
 
+
 	g_signal_connect (miner_applications, "finished",
 	                  G_CALLBACK (miner_finished_cb),
 	                  NULL);