[tracker/harmattan: 1209/2240] Updated patch 02 to apply against recent changes to master

[Martyn James Russell <mr src gnome org>]

commit 7c6be6ccd3a4bd13c932b60a8c3ba953a0bc5cd8
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 2 17:23:09 2009 +0100

    Updated patch 02 to apply against recent changes to master

 debian/patches/02-default-config.patch |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index a1f302b..cfe68fb 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,5 +1,5 @@
 diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
-index 2d786f1..f0daa37 100644
+index fd2463a..b881936 100644
 --- a/src/tracker-miner-fs/tracker-config.c
 +++ b/src/tracker-miner-fs/tracker-config.c
 @@ -41,7 +41,7 @@
@@ -20,13 +20,12 @@ index 2d786f1..f0daa37 100644
  #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
  #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
  
-@@ -563,9 +563,13 @@ config_create_with_defaults (TrackerConfig *config,
+@@ -588,6 +588,22 @@ config_create_with_defaults (TrackerConfig *config,
  		case G_TYPE_POINTER:
  			/* Special case string lists */
  			if (g_strcmp0 (conversions[i].property, "index-recursive-directories") == 0) {
--				const gchar *string_list[] = { NULL, NULL };
--
--				string_list[0] = g_get_home_dir ();
++#define MAEMO
++#ifdef  MAEMO
 +				const gchar *string_list[] = {
 +					"$HOME/MyDocs/.sounds/",
 +					"$HOME/MyDocs/.documents/",
@@ -34,11 +33,21 @@ index 2d786f1..f0daa37 100644
 +					"$HOME/MyDocs/.images/",
 +					"$HOME/MyDocs/.camera/",
 +				};
++
++				g_key_file_set_string_list (key_file, 
++							    conversions[i].group, 
++							    conversions[i].key, 
++							    string_list, 
++							    G_N_ELEMENTS (string_list));
++#else  /* MAEMO */
+ 				/* Since we can't know if
+ 				 * $HOME/.config/user-dirs.dirs exists
+ 				 * or not, we check that the GLib API
+@@ -658,8 +674,12 @@ config_create_with_defaults (TrackerConfig *config,
+ 							    g_strv_length (string_list));
  
- 				g_key_file_set_string_list (key_file, 
- 							    conversions[i].group, 
-@@ -574,6 +578,9 @@ config_create_with_defaults (TrackerConfig *config,
- 							    G_N_ELEMENTS (string_list));
+ 				g_strfreev (string_list);
++#endif /* MAEMO */
  			} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
  				const gchar *string_list[] = { 
 +					"$HOME/MyDocs/core-dumps/",