[tracker/harmattan: 1802/2240] Don't include the changes to patch 02 in patch 02, silly



commit dccb8795e3490a429de03ea80076d2df6dc6ccea
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Dec 11 15:52:50 2009 +0000

    Don't include the changes to patch 02 in patch 02, silly

 debian/patches/02-default-config.patch |   64 --------------------------------
 1 files changed, 0 insertions(+), 64 deletions(-)
---
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index a13c6ca..fc64da0 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,67 +1,3 @@
-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 8d80fb3..32d1bff 100644
 --- a/src/tracker-miner-fs/tracker-config.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]