[tracker/harmattan: 1801/2240] Fixed patch 02 after whitespace fixes

[Martyn James Russell <mr src gnome org>]

commit 802e4a8665717fa1000f4a6fbb39d0b54baa8198
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Dec 11 15:49:03 2009 +0000

    Fixed patch 02 after whitespace fixes

 debian/patches/02-default-config.patch |   99 +++++++++++++++++++++++++++-----
 1 files changed, 84 insertions(+), 15 deletions(-)
---
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index 3c600f4..a13c6ca 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,26 +1,90 @@
+diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
+index 3c600f4..e69de29 100644
+--- a/debian/patches/02-default-config.patch
++++ b/debian/patches/02-default-config.patch
+@@ -1,59 +0,0 @@
+-diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
+-index fd2463a..f354ebc 100644
+---- a/src/tracker-miner-fs/tracker-config.c
+-+++ b/src/tracker-miner-fs/tracker-config.c
+-@@ -41,7 +41,7 @@
+- 
+- /* Default values */
+- #define DEFAULT_VERBOSITY			 0
+--#define DEFAULT_INITIAL_SLEEP			 15	  /* 0->1000 */
+-+#define DEFAULT_INITIAL_SLEEP			 7	  /* 0->1000 */
+- #define DEFAULT_ENABLE_MONITORS			 TRUE
+- #define DEFAULT_THROTTLE			 0	  /* 0->20 */
+- #define DEFAULT_SCAN_TIMEOUT			 0	  /* 0->1000 */
+-@@ -49,7 +49,7 @@
+- #define DEFAULT_ENABLE_THUMBNAILS		 TRUE
+- #define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
+- #define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
+--#define DEFAULT_INDEX_ON_BATTERY                 FALSE
+-+#define DEFAULT_INDEX_ON_BATTERY                 TRUE
+- #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
+- #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
+- 
+-@@ -588,6 +588,23 @@ config_create_with_defaults (TrackerConfig *config,
+- 		case G_TYPE_POINTER:
+- 			/* Special case string lists */
+- 			if (g_strcmp0 (conversions[i].property, "index-recursive-directories") == 0) {
+-+#define MAEMO
+-+#ifdef  MAEMO
+-+				const gchar *string_list[] = {
+-+					"$HOME/MyDocs",
+-+					"$HOME/MyDocs/.sounds",
+-+					"$HOME/MyDocs/.documents",
+-+					"$HOME/MyDocs/.videos",
+-+					"$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 +675,12 @@ config_create_with_defaults (TrackerConfig *config,
+- 							    g_strv_length (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/",
+-+					"$HOME/MyDocs/cities/",
+-+					"$HOME/MyDocs/.sounds/Ringtones/",
+- 					"po", "CVS", ".svn", ".git", "core-dumps", "lost+found",
+- 					NULL
+- 				};
 diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
-index fd2463a..f354ebc 100644
+index 8d80fb3..32d1bff 100644
 --- a/src/tracker-miner-fs/tracker-config.c
 +++ b/src/tracker-miner-fs/tracker-config.c
 @@ -41,7 +41,7 @@
  
  /* Default values */
- #define DEFAULT_VERBOSITY			 0
--#define DEFAULT_INITIAL_SLEEP			 15	  /* 0->1000 */
-+#define DEFAULT_INITIAL_SLEEP			 7	  /* 0->1000 */
- #define DEFAULT_ENABLE_MONITORS			 TRUE
- #define DEFAULT_THROTTLE			 0	  /* 0->20 */
- #define DEFAULT_SCAN_TIMEOUT			 0	  /* 0->1000 */
+ #define DEFAULT_VERBOSITY                        0
+-#define DEFAULT_INITIAL_SLEEP                    15       /* 0->1000 */
++#define DEFAULT_INITIAL_SLEEP                    7       /* 0->1000 */
+ #define DEFAULT_ENABLE_MONITORS                          TRUE
+ #define DEFAULT_THROTTLE                         0        /* 0->20 */
+ #define DEFAULT_SCAN_TIMEOUT                     0        /* 0->1000 */
 @@ -49,7 +49,7 @@
- #define DEFAULT_ENABLE_THUMBNAILS		 TRUE
- #define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
- #define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
+ #define DEFAULT_ENABLE_THUMBNAILS                TRUE
+ #define DEFAULT_INDEX_MOUNTED_DIRECTORIES        TRUE
+ #define DEFAULT_INDEX_REMOVABLE_DEVICES                  TRUE
 -#define DEFAULT_INDEX_ON_BATTERY                 FALSE
 +#define DEFAULT_INDEX_ON_BATTERY                 TRUE
  #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
- #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
+ #define DEFAULT_LOW_DISK_SPACE_LIMIT             1        /* 0->100 / -1 */
  
-@@ -588,6 +588,23 @@ config_create_with_defaults (TrackerConfig *config,
+@@ -589,6 +589,23 @@ config_create_with_defaults (TrackerConfig *config,
  		case G_TYPE_POINTER:
  			/* Special case string lists */
  			if (g_strcmp0 (conversions[i].property, "index-recursive-directories") == 0) {
@@ -44,13 +108,18 @@ index fd2463a..f354ebc 100644
  				/* Since we can't know if
  				 * $HOME/.config/user-dirs.dirs exists
  				 * or not, we check that the GLib API
-@@ -658,8 +675,12 @@ config_create_with_defaults (TrackerConfig *config,
- 							    g_strv_length (string_list));
+@@ -660,6 +677,7 @@ config_create_with_defaults (TrackerConfig *config,
+ 				                            g_strv_length (string_list));
  
  				g_strfreev (string_list);
 +#endif /* MAEMO */
+ 			} else if (g_strcmp0 (conversions[i].property, "index-single-directories") == 0) {
+ 				GSList *paths = NULL;
+ 				GStrv string_list;
+@@ -680,6 +698,9 @@ config_create_with_defaults (TrackerConfig *config,
+ 				g_strfreev (string_list);
  			} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
- 				const gchar *string_list[] = { 
+ 				const gchar *string_list[] = {
 +					"$HOME/MyDocs/core-dumps/",
 +					"$HOME/MyDocs/cities/",
 +					"$HOME/MyDocs/.sounds/Ringtones/",