GNOME.org
 

[tracker/libtracker-miner] Move config options around so they are more logically groupped

commit c87418d6da47c02f8e9fef4a7d6dec28f29753b8
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Aug 25 17:19:08 2009 +0100

    Move config options around so they are more logically groupped

 src/tracker-miner-fs/tracker-config.c |  180 ++++++++++++++++----------------
 src/tracker-miner-fs/tracker-config.h |   12 +-
 2 files changed, 96 insertions(+), 96 deletions(-)
---
diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
index 2d90044..60995c2 100644
--- a/src/tracker-miner-fs/tracker-config.c
+++ b/src/tracker-miner-fs/tracker-config.c
@@ -47,10 +47,10 @@
 #define DEFAULT_SCAN_TIMEOUT			 0	  /* 0->1000 */
 #define DEFAULT_CACHE_TIMEOUT			 60	  /* 0->1000 */
 #define DEFAULT_ENABLE_THUMBNAILS		 TRUE
-#define DEFAULT_INDEX_ON_BATTERY                 FALSE
-#define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
 #define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
 #define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
+#define DEFAULT_INDEX_ON_BATTERY                 FALSE
+#define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
 #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
 
 typedef struct {
@@ -68,6 +68,8 @@ typedef struct {
 	gboolean  enable_thumbnails;
 	gboolean  index_on_battery;
 	gboolean  index_on_battery_first_time;
+	gboolean  index_mounted_directories;
+	gboolean  index_removable_devices;	
 	gint	  low_disk_space_limit;
 	GSList   *index_recursive_directories;
 	GSList	 *index_single_directories;
@@ -76,8 +78,6 @@ typedef struct {
 	GSList   *ignored_files;
 	GSList   *ignored_directory_patterns;
 	GSList   *ignored_file_patterns;
-	gboolean  index_mounted_directories;
-	gboolean  index_removable_devices;	
 } TrackerConfigPrivate;
 
 typedef struct {
@@ -120,14 +120,14 @@ enum {
 	PROP_ENABLE_THUMBNAILS,
 	PROP_INDEX_ON_BATTERY,
 	PROP_INDEX_ON_BATTERY_FIRST_TIME,
+	PROP_INDEX_MOUNTED_DIRECTORIES,
+	PROP_INDEX_REMOVABLE_DEVICES,
 	PROP_LOW_DISK_SPACE_LIMIT,
 	PROP_INDEX_RECURSIVE_DIRECTORIES,
 	PROP_INDEX_SINGLE_DIRECTORIES,
 	PROP_IGNORED_DIRECTORIES,
 	PROP_IGNORED_DIRECTORIES_WITH_CONTENT,
 	PROP_IGNORED_FILES,
-	PROP_INDEX_MOUNTED_DIRECTORIES,
-	PROP_INDEX_REMOVABLE_DEVICES,
 };
 
 static ObjectToKeyFile conversions[] = {
@@ -143,14 +143,14 @@ static ObjectToKeyFile conversions[] = {
 	{ G_TYPE_BOOLEAN, "enable-thumbnails",                GROUP_INDEXING, "EnableThumbnails"          },
 	{ G_TYPE_BOOLEAN, "index-on-battery",                 GROUP_INDEXING, "IndexOnBattery"            },
 	{ G_TYPE_BOOLEAN, "index-on-battery-first-time",      GROUP_INDEXING, "IndexOnBatteryFirstTime"   },
+	{ G_TYPE_BOOLEAN, "index-mounted-directories",        GROUP_INDEXING, "IndexMountedDirectories"   },
+	{ G_TYPE_BOOLEAN, "index-removable-devices",          GROUP_INDEXING, "IndexRemovableMedia"       },
 	{ G_TYPE_INT,     "low-disk-space-limit",             GROUP_INDEXING, "LowDiskSpaceLimit"         },
 	{ G_TYPE_POINTER, "index-recursive-directories",      GROUP_INDEXING, "IndexRecursiveDirectories" },
 	{ G_TYPE_POINTER, "index-single-directories",         GROUP_INDEXING, "IndexSingleDirectories"    },
 	{ G_TYPE_POINTER, "ignored-directories",              GROUP_INDEXING, "IgnoredDirectories"        },
 	{ G_TYPE_POINTER, "ignored-directories-with-content", GROUP_INDEXING, "IgnoredDirectoriesWithContent" },
 	{ G_TYPE_POINTER, "ignored-files",                    GROUP_INDEXING, "IgnoredFiles"              },
-	{ G_TYPE_BOOLEAN, "index-mounted-directories",        GROUP_INDEXING, "IndexMountedDirectories"   },
-	{ G_TYPE_BOOLEAN, "index-removable-devices",          GROUP_INDEXING, "IndexRemovableMedia"       },
 };
 
 G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_FILE);
@@ -245,6 +245,21 @@ tracker_config_class_init (TrackerConfigClass *klass)
 							       DEFAULT_INDEX_ON_BATTERY_FIRST_TIME,
 							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 	g_object_class_install_property (object_class,
+					 PROP_INDEX_MOUNTED_DIRECTORIES,
+					 g_param_spec_boolean ("index-mounted-directories",
+							       "Index mounted directories",
+							       " Set to true to enable traversing mounted directories on other file systems\n"
+							       " (this excludes removable devices)",
+							       DEFAULT_INDEX_MOUNTED_DIRECTORIES,
+							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	g_object_class_install_property (object_class,
+					 PROP_INDEX_REMOVABLE_DEVICES,
+					 g_param_spec_boolean ("index-removable-devices",
+							       "index removable devices",
+							       " Set to true to enable traversing mounted directories for removable devices",
+							       DEFAULT_INDEX_REMOVABLE_DEVICES,
+							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+	g_object_class_install_property (object_class,
 					 PROP_LOW_DISK_SPACE_LIMIT,
 					 g_param_spec_int ("low-disk-space-limit",
 							   "Low disk space limit",
@@ -284,21 +299,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
 							       "Ignored files",
 							       " List of files to NOT index (separator=;)",
 							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	g_object_class_install_property (object_class,
-					 PROP_INDEX_MOUNTED_DIRECTORIES,
-					 g_param_spec_boolean ("index-mounted-directories",
-							       "Index mounted directories",
-							       " Set to true to enable traversing mounted directories on other file systems\n"
-							       " (this excludes removable devices)",
-							       DEFAULT_INDEX_MOUNTED_DIRECTORIES,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	g_object_class_install_property (object_class,
-					 PROP_INDEX_REMOVABLE_DEVICES,
-					 g_param_spec_boolean ("index-removable-devices",
-							       "index removable devices",
-							       " Set to true to enable traversing mounted directories for removable devices",
-							       DEFAULT_INDEX_REMOVABLE_DEVICES,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_type_class_add_private (object_class, sizeof (TrackerConfigPrivate));
 }
@@ -356,6 +356,14 @@ config_set_property (GObject	  *object,
 		tracker_config_set_index_on_battery_first_time (TRACKER_CONFIG (object),
 								g_value_get_boolean (value));
 		break;
+	case PROP_INDEX_MOUNTED_DIRECTORIES:
+		tracker_config_set_index_mounted_directories (TRACKER_CONFIG (object),
+							      g_value_get_boolean (value));
+		break;
+	case PROP_INDEX_REMOVABLE_DEVICES:
+		tracker_config_set_index_removable_devices (TRACKER_CONFIG (object),
+							    g_value_get_boolean (value));
+		break;
 	case PROP_LOW_DISK_SPACE_LIMIT:
 		tracker_config_set_low_disk_space_limit (TRACKER_CONFIG (object),
 							 g_value_get_int (value));
@@ -380,14 +388,6 @@ config_set_property (GObject	  *object,
 		tracker_config_set_ignored_files (TRACKER_CONFIG (object),
 						  g_value_get_pointer (value));
 		break;
-	case PROP_INDEX_MOUNTED_DIRECTORIES:
-		tracker_config_set_index_mounted_directories (TRACKER_CONFIG (object),
-							      g_value_get_boolean (value));
-		break;
-	case PROP_INDEX_REMOVABLE_DEVICES:
-		tracker_config_set_index_removable_devices (TRACKER_CONFIG (object),
-							    g_value_get_boolean (value));
-		break;
 
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -438,6 +438,12 @@ config_get_property (GObject	*object,
 	case PROP_INDEX_ON_BATTERY_FIRST_TIME:
 		g_value_set_boolean (value, priv->index_on_battery_first_time);
 		break;
+	case PROP_INDEX_MOUNTED_DIRECTORIES:
+		g_value_set_boolean (value, priv->index_mounted_directories);
+		break;
+	case PROP_INDEX_REMOVABLE_DEVICES:
+		g_value_set_boolean (value, priv->index_removable_devices);
+		break;
 	case PROP_LOW_DISK_SPACE_LIMIT:
 		g_value_set_int (value, priv->low_disk_space_limit);
 		break;
@@ -456,12 +462,6 @@ config_get_property (GObject	*object,
 	case PROP_IGNORED_FILES:
 		g_value_set_pointer (value, priv->ignored_files);
 		break;
-	case PROP_INDEX_MOUNTED_DIRECTORIES:
-		g_value_set_boolean (value, priv->index_mounted_directories);
-		break;
-	case PROP_INDEX_REMOVABLE_DEVICES:
-		g_value_set_boolean (value, priv->index_removable_devices);
-		break;
 
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -908,6 +908,30 @@ tracker_config_get_index_on_battery_first_time (TrackerConfig *config)
 	return priv->index_on_battery_first_time;
 }
 
+gboolean
+tracker_config_get_index_mounted_directories (TrackerConfig *config)
+{
+	TrackerConfigPrivate *priv;
+
+	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_INDEX_MOUNTED_DIRECTORIES);
+
+	priv = TRACKER_CONFIG_GET_PRIVATE (config);
+
+	return priv->index_mounted_directories;
+}
+
+gboolean
+tracker_config_get_index_removable_devices (TrackerConfig *config)
+{
+	TrackerConfigPrivate *priv;
+
+	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_INDEX_REMOVABLE_DEVICES);
+
+	priv = TRACKER_CONFIG_GET_PRIVATE (config);
+
+	return priv->index_removable_devices;
+}
+
 gint
 tracker_config_get_low_disk_space_limit (TrackerConfig *config)
 {
@@ -980,30 +1004,6 @@ tracker_config_get_ignored_files (TrackerConfig *config)
 	return priv->ignored_files;
 }
 
-gboolean
-tracker_config_get_index_mounted_directories (TrackerConfig *config)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_INDEX_MOUNTED_DIRECTORIES);
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	return priv->index_mounted_directories;
-}
-
-gboolean
-tracker_config_get_index_removable_devices (TrackerConfig *config)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_INDEX_REMOVABLE_DEVICES);
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	return priv->index_removable_devices;
-}
-
 void
 tracker_config_set_verbosity (TrackerConfig *config,
 			      gint	     value)
@@ -1138,7 +1138,7 @@ tracker_config_set_index_on_battery (TrackerConfig *config,
 
 void
 tracker_config_set_index_on_battery_first_time (TrackerConfig *config,
-						gboolean	    value)
+						gboolean       value)
 {
 	TrackerConfigPrivate *priv;
 
@@ -1151,6 +1151,34 @@ tracker_config_set_index_on_battery_first_time (TrackerConfig *config,
 }
 
 void
+tracker_config_set_index_mounted_directories (TrackerConfig *config,
+					      gboolean	     value)
+{
+	TrackerConfigPrivate *priv;
+
+	g_return_if_fail (TRACKER_IS_CONFIG (config));
+
+	priv = TRACKER_CONFIG_GET_PRIVATE (config);
+
+	priv->index_mounted_directories = value;
+	g_object_notify (G_OBJECT (config), "index-mounted-directories");
+}
+
+void
+tracker_config_set_index_removable_devices (TrackerConfig *config,
+					    gboolean	   value)
+{
+	TrackerConfigPrivate *priv;
+
+	g_return_if_fail (TRACKER_IS_CONFIG (config));
+
+	priv = TRACKER_CONFIG_GET_PRIVATE (config);
+
+	priv->index_removable_devices = value;
+	g_object_notify (G_OBJECT (config), "index-removable-devices");
+}
+
+void
 tracker_config_set_low_disk_space_limit (TrackerConfig *config,
 					 gint		value)
 {
@@ -1299,34 +1327,6 @@ tracker_config_set_ignored_files (TrackerConfig *config,
 	g_object_notify (G_OBJECT (config), "ignored-files");
 }
 
-void
-tracker_config_set_index_mounted_directories (TrackerConfig *config,
-					      gboolean	     value)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	priv->index_mounted_directories = value;
-	g_object_notify (G_OBJECT (config), "index-mounted-directories");
-}
-
-void
-tracker_config_set_index_removable_devices (TrackerConfig *config,
-					    gboolean	 value)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	priv->index_removable_devices = value;
-	g_object_notify (G_OBJECT (config), "index-removable-devices");
-}
-
 /*
  * Convenience functions
  */
diff --git a/src/tracker-miner-fs/tracker-config.h b/src/tracker-miner-fs/tracker-config.h
index 1f8b92a..dd13da6 100644
--- a/src/tracker-miner-fs/tracker-config.h
+++ b/src/tracker-miner-fs/tracker-config.h
@@ -59,14 +59,14 @@ gint           tracker_config_get_throttle                         (TrackerConfi
 gboolean       tracker_config_get_enable_thumbnails                (TrackerConfig *config);
 gboolean       tracker_config_get_index_on_battery                 (TrackerConfig *config);
 gboolean       tracker_config_get_index_on_battery_first_time      (TrackerConfig *config);
+gboolean       tracker_config_get_index_removable_devices          (TrackerConfig *config);
+gboolean       tracker_config_get_index_mounted_directories        (TrackerConfig *config);
 gint           tracker_config_get_low_disk_space_limit             (TrackerConfig *config);
 GSList *       tracker_config_get_index_recursive_directories      (TrackerConfig *config);
 GSList *       tracker_config_get_index_single_directories         (TrackerConfig *config);
 GSList *       tracker_config_get_ignored_directories              (TrackerConfig *config);
 GSList *       tracker_config_get_ignored_directories_with_content (TrackerConfig *config);
 GSList *       tracker_config_get_ignored_files                    (TrackerConfig *config);
-gboolean       tracker_config_get_index_removable_devices          (TrackerConfig *config);
-gboolean       tracker_config_get_index_mounted_directories        (TrackerConfig *config);
 
 void           tracker_config_set_verbosity                        (TrackerConfig *config,
 								    gint           value);
@@ -86,6 +86,10 @@ void           tracker_config_set_index_on_battery                 (TrackerConfi
 								    gboolean       value);
 void           tracker_config_set_index_on_battery_first_time      (TrackerConfig *config,
 								    gboolean       value);
+void           tracker_config_set_index_removable_devices          (TrackerConfig *config,
+								    gboolean       value);
+void           tracker_config_set_index_mounted_directories        (TrackerConfig *config,
+								    gboolean       value);
 void           tracker_config_set_low_disk_space_limit             (TrackerConfig *config,
 								    gint           value);
 void	       tracker_config_set_index_recursive_directories      (TrackerConfig *config,
@@ -98,10 +102,6 @@ void	       tracker_config_set_ignored_directories_with_content (TrackerConfig *
 								    GSList        *files);
 void	       tracker_config_set_ignored_files                    (TrackerConfig *config,
 								    GSList        *files);
-void           tracker_config_set_index_removable_devices          (TrackerConfig *config,
-								    gboolean       value);
-void           tracker_config_set_index_mounted_directories        (TrackerConfig *config,
-								    gboolean       value);
 
 /* Convenience functions */
 GSList *       tracker_config_get_ignore_directory_patterns        (TrackerConfig *config);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]