[tracker/miner-userguide: 12/13] tracker-miner-fs: Added locale checking on directories

[Martyn James Russell <mr src gnome org>]

commit 6901120652561b4575df8b88516d704b4ec0f176
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Nov 24 11:20:27 2011 +0000

    tracker-miner-fs: Added locale checking on directories
    
    If not the current locale, we ignore the userguide directory, but only
    when we HAVE_MEEGOTOUCH.

 src/miners/fs/tracker-miner-locale.c     |    2 +-
 src/miners/fs/tracker-miner-userguides.c |   38 ++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/src/miners/fs/tracker-miner-locale.c b/src/miners/fs/tracker-miner-locale.c
index 95d54b5..9cf39f5 100644
--- a/src/miners/fs/tracker-miner-locale.c
+++ b/src/miners/fs/tracker-miner-locale.c
@@ -24,7 +24,7 @@
 
 #include "tracker-miner-locale.h"
 #ifdef HAVE_MEEGOTOUCH
-#include "tracker-miner-applications-meego.h"
+#include "tracker-miner-meego.h"
 #endif
 
 /* NOTE: This applies to more miners than just the application miner,
diff --git a/src/miners/fs/tracker-miner-userguides.c b/src/miners/fs/tracker-miner-userguides.c
index 999f3ad..122fa31 100644
--- a/src/miners/fs/tracker-miner-userguides.c
+++ b/src/miners/fs/tracker-miner-userguides.c
@@ -240,7 +240,7 @@ static gboolean
 miner_userguides_check_directory (TrackerMinerFS *fs,
                                   GFile          *file)
 {
-	gboolean retval = TRUE;
+	gboolean retval = FALSE;
 	gchar *basename;
 
 	/* We want to inspect all the passed dirs and their children except one:
@@ -248,12 +248,42 @@ miner_userguides_check_directory (TrackerMinerFS *fs,
 	 */
 	basename = g_file_get_basename (file);
 
-	/* FIXME: Perhaps this is too broad? */
-	if (strcmp (basename, "images") == 0) {
+	if (strcmp (basename, "images") != 0) {
 		g_message ("  Ignoring:'%s'", basename);
-		retval = FALSE;
+		retval = TRUE;
+	}
+
+	/* Without MeeGoTouch, we simply index ALL content. */
+#ifdef HAVE_MEEGOTOUCH
+	GFile *parent;
+	gchar *parent_basename;
+
+	/* We want to ignore all locales which are not the current one:
+	 * $prefix/userguide/contents/$locale/
+	 */
+	parent = g_file_get_parent (file);
+	if (parent) {
+		parent_basename = g_file_get_basename (parent);
+	} else {
+		parent_basename = NULL;
+	}
+
+	if (parent_basename && strcmp (parent_basename, "contents") == 0) {
+		gchar *locale;
+
+		locale = tracker_miner_meego_get_locale ();
+
+		if (locale && g_ascii_strcasecmp (locale, basename) == 0) {
+			g_message ("  Ignoring:'%s' (doesn't match locale:'%s')",
+			           basename, locale);
+			retval = TRUE;
+		}
+
+		g_free (locale);
 	}
 
+	g_free (parent_basename);
+#endif /* HAVE_MEEGOTOUCH */
 	g_free (basename);
 
 	return retval;