[tracker/harmattan: 402/2240] Updated from Fremantle patch and to new config changes in libtracker-common

[Martyn James Russell <mr src gnome org>]

commit eb84f6f88b77869bf3e48e3179ebd9f349bf15fa
Author: Martyn Russell <martyn imendio com>
Date:   Mon Jul 20 16:31:07 2009 +0100

    Updated from Fremantle patch and to new config changes in libtracker-common

 debian/patches/02-default-config.patch |  102 +++++++++++++++-----------------
 1 files changed, 48 insertions(+), 54 deletions(-)
---
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index 06c637e..464f52f 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,64 +1,58 @@
-diff --git a/src/libtracker-common/tracker-config.c b/src/libtracker-common/tracker-config.c
-index bbcbf5b..cefb944 100644
---- a/src/libtracker-common/tracker-config.c
-+++ b/src/libtracker-common/tracker-config.c
-@@ -76,7 +76,7 @@
+diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
+index 21cef9e..163dfa3 100644
+--- a/src/tracker-miner-fs/tracker-config.c
++++ b/src/tracker-miner-fs/tracker-config.c
+@@ -41,11 +41,11 @@
  
  /* Default values */
  #define DEFAULT_VERBOSITY			 0
--#define DEFAULT_INITIAL_SLEEP			 45	  /* 0->1000 */
+-#define DEFAULT_INITIAL_SLEEP			 15	  /* 0->1000 */
 +#define DEFAULT_INITIAL_SLEEP			 7	  /* 0->1000 */
- #define DEFAULT_LOW_MEMORY_MODE			 FALSE
- #define DEFAULT_NFS_LOCKING			 FALSE
  #define DEFAULT_ENABLE_WATCHES			 TRUE
-@@ -89,15 +89,15 @@
- #define DEFAULT_MIN_WORD_LENGTH			 3	  /* 0->30 */
- #define DEFAULT_MAX_WORD_LENGTH			 30	  /* 0->200 */
- #define DEFAULT_ENABLE_STEMMER			 TRUE
+ #define DEFAULT_THROTTLE			 0	  /* 0->20 */
+ #define DEFAULT_ENABLE_THUMBNAILS		 TRUE
 -#define DEFAULT_DISABLE_INDEXING_ON_BATTERY	 TRUE
 +#define DEFAULT_DISABLE_INDEXING_ON_BATTERY	 FALSE
  #define DEFAULT_DISABLE_INDEXING_ON_BATTERY_INIT FALSE
  #define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
  #define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
- #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
- #define DEFAULT_MAX_TEXT_TO_INDEX		 1048576  /* Bytes */
- #define DEFAULT_MAX_WORDS_TO_INDEX		 10000
--#define DEFAULT_MAX_BUCKET_COUNT		 524288
--#define DEFAULT_MIN_BUCKET_COUNT		 65536
-+#define DEFAULT_MAX_BUCKET_COUNT		 65535
-+#define DEFAULT_MIN_BUCKET_COUNT		 32768
- 
- typedef struct _TrackerConfigPrivate TrackerConfigPrivate;
- 
-@@ -789,8 +789,20 @@ config_create_with_defaults (GKeyFile *key_file,
- 			     gboolean  overwrite)
- {
- 	gchar	     *language;
--	const gchar  *watch_directory_roots[2] = { NULL, NULL };
- 	const gchar  *empty_string_list[] = { NULL };
-+	const gchar  *no_watch_directory_roots[3] = {  
-+		"$HOME/MyDocs/core-dumps/",
-+		"$HOME/MyDocs/cities/", 
-+		NULL
-+	};
-+	const gchar  *watch_directory_roots[6] = {  
-+		"$HOME/MyDocs/",
-+		"$HOME/MyDocs/.sounds/", 
-+		"$HOME/MyDocs/.documents/", 
-+		"$HOME/MyDocs/.videos/", 
-+		"$HOME/MyDocs/.images/", 
-+		NULL 
-+	};
- 
- 	/* Get default values */
- 	language = tracker_language_get_default_code ();
-@@ -852,7 +864,8 @@ config_create_with_defaults (GKeyFile *key_file,
- 
- 	if (overwrite || !g_key_file_has_key (key_file, GROUP_WATCHES, KEY_NO_WATCH_DIRECTORY_ROOTS, NULL)) {
- 		g_key_file_set_string_list (key_file, GROUP_WATCHES, KEY_NO_WATCH_DIRECTORY_ROOTS,
--					    empty_string_list, 0);
-+					    no_watch_directory_roots, 
-+					    g_strv_length ((gchar**) no_watch_directory_roots));
- 		g_key_file_set_comment (key_file, GROUP_WATCHES, KEY_NO_WATCH_DIRECTORY_ROOTS,
- 					" List of directory roots NOT to index and NOT to watch (separator=;)",
- 					NULL);
+@@ -482,14 +482,31 @@ config_create_with_defaults (TrackerConfig *config,
+ 		case G_TYPE_POINTER:
+ 			/* Special case string lists */
+ 			if (g_strcmp0 (conversions[i].property, "watch-directory-roots") == 0) {
+-				const gchar *string_list[] = { NULL, NULL };
+-
+-				string_list[0] = g_get_home_dir ();
+-
+-				g_key_file_set_string_list (key_file, 
+-							    conversions[i].group, 
+-							    conversions[i].key, 
+-							    string_list, 
++				const gchar *string_list[5] = {
++					"$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 if (g_strcmp0 (conversions[i].property, "no-watch-directory-roots") == 0) {
++				const gchar *string_list[3] = {
++					"$HOME/MyDocs/core-dumps/",
++					"$HOME/MyDocs/cities/",
++					"$HOME/MyDocs/.sounds/Ringtones/",
++				};
++
++				g_key_file_set_string_list (key_file,
++							    conversions[i].group,
++							    conversions[i].key,
++							    string_list,
+ 							    G_N_ELEMENTS (string_list));
+ 			} else {
+ 				const gchar *string_list[] = { NULL };