[tracker/harmattan-pre-signal-updates: 1241/1380] debian: Fixed patch 02 since 2 options were removed from config

[Martyn James Russell <mr src gnome org>]

commit 2f09ea0182c8246beb66f62d9b836791669eb48e
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 2 17:17:37 2010 +0100

    debian: Fixed patch 02 since 2 options were removed from config

 debian/patches/02-default-config.patch |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index b0d1275..4704071 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,8 +1,8 @@
 diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
-index 9ba2700..df0b978 100644
+index f81f16d..c13d128 100644
 --- a/src/miners/fs/tracker-config.c
 +++ b/src/miners/fs/tracker-config.c
-@@ -41,16 +41,16 @@
+@@ -41,14 +41,14 @@
  
  /* Default values */
  #define DEFAULT_VERBOSITY                        0
@@ -10,8 +10,6 @@ index 9ba2700..df0b978 100644
 +#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_CACHE_TIMEOUT                    60       /* 0->1000 */
  #define DEFAULT_INDEX_REMOVABLE_DEVICES          TRUE
  #define DEFAULT_INDEX_OPTICAL_DISCS              FALSE
 -#define DEFAULT_INDEX_ON_BATTERY                 FALSE
@@ -22,7 +20,7 @@ index 9ba2700..df0b978 100644
  #define DEFAULT_CRAWLING_INTERVAL                0        /* 0->365 / -1 */
  
  typedef struct {
-@@ -601,6 +601,24 @@ config_create_with_defaults (TrackerConfig *config,
+@@ -561,6 +561,24 @@ config_create_with_defaults (TrackerConfig *config,
  		case G_TYPE_POINTER:
  			/* Special case string lists */
  			if (g_strcmp0 (conversions[i].property, "index-recursive-directories") == 0) {
@@ -47,7 +45,7 @@ index 9ba2700..df0b978 100644
  				/* Since we can't know if
  				 * $HOME/.config/user-dirs.dirs exists
  				 * or not, we check that the GLib API
-@@ -672,12 +690,15 @@ config_create_with_defaults (TrackerConfig *config,
+@@ -632,12 +650,15 @@ config_create_with_defaults (TrackerConfig *config,
  				                            g_strv_length (string_list));
  
  				g_strfreev (string_list);
@@ -63,7 +61,7 @@ index 9ba2700..df0b978 100644
  				}
  
  				string_list = tracker_gslist_to_string_list (paths);
-@@ -692,6 +713,12 @@ config_create_with_defaults (TrackerConfig *config,
+@@ -652,6 +673,12 @@ config_create_with_defaults (TrackerConfig *config,
  				g_strfreev (string_list);
  			} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
  				const gchar *string_list[] = {