[tracker] Renamed config modules to reflect real roles
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker] Renamed config modules to reflect real roles
- Date: Mon, 27 Jul 2009 18:16:29 +0000 (UTC)
commit aa9affd19b04a2c209a4561f09dfcf2efeacaafd
Author: Martyn Russell <martyn imendio com>
Date: Mon Jul 27 10:16:50 2009 +0100
Renamed config modules to reflect real roles
tracker-config-manager is now tracker-config-file
tracker-config-utils is now tracker-keyfile-object
src/libtracker-common/Makefile.am | 8 +-
...cker-config-manager.c => tracker-config-file.c} | 122 ++++++------
src/libtracker-common/tracker-config-file.h | 61 ++++++
src/libtracker-common/tracker-config-manager.h | 118 ------------
src/libtracker-common/tracker-config-utils.h | 81 --------
...ker-config-utils.c => tracker-keyfile-object.c} | 192 ++++++++++----------
src/libtracker-common/tracker-keyfile-object.h | 81 ++++++++
src/tracker-extract/tracker-config.c | 54 +++---
src/tracker-extract/tracker-config.h | 6 +-
src/tracker-fts/tracker-fts-config.c | 58 +++---
src/tracker-fts/tracker-fts-config.h | 6 +-
src/tracker-miner-fs/tracker-config.c | 112 ++++++------
src/tracker-miner-fs/tracker-config.h | 8 +-
src/tracker-store/tracker-config.c | 52 +++---
src/tracker-store/tracker-config.h | 6 +-
15 files changed, 453 insertions(+), 512 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 7587e81..893a704 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -57,12 +57,12 @@ libtracker_common_la_SOURCES = \
$(os_sources) \
$(power_sources) \
$(storage_sources) \
- tracker-config-manager.c \
- tracker-config-utils.c \
+ tracker-config-file.c \
tracker-class.c \
tracker-dbus.c \
tracker-file-utils.c \
tracker-ioprio.c \
+ tracker-keyfile-object.c \
tracker-language.c \
tracker-log.c \
tracker-marshal-main.c \
@@ -90,11 +90,11 @@ noinst_HEADERS = \
tracker-albumart.h
libtracker_commoninclude_HEADERS = \
- tracker-config-manager.h \
- tracker-config-utils.h \
+ tracker-config-file.h \
tracker-class.h \
tracker-common.h \
tracker-file-utils.h \
+ tracker-keyfile-object.h \
tracker-language.h \
tracker-module-config.h \
tracker-namespace.h \
diff --git a/src/libtracker-common/tracker-config-manager.c b/src/libtracker-common/tracker-config-file.c
similarity index 68%
rename from src/libtracker-common/tracker-config-manager.c
rename to src/libtracker-common/tracker-config-file.c
index dd865af..dba7749 100644
--- a/src/libtracker-common/tracker-config-manager.c
+++ b/src/libtracker-common/tracker-config-file.c
@@ -23,19 +23,19 @@
#include <string.h>
#include <stdlib.h>
-#include "tracker-config-manager.h"
+#include "tracker-config-file.h"
-#define TRACKER_CONFIG_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG_MANAGER, TrackerConfigManagerPrivate))
+#define TRACKER_CONFIG_FILE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFilePrivate))
-typedef struct _TrackerConfigManagerPrivate TrackerConfigManagerPrivate;
+typedef struct _TrackerConfigFilePrivate TrackerConfigFilePrivate;
-struct _TrackerConfigManagerPrivate {
+struct _TrackerConfigFilePrivate {
gchar *domain;
};
static void config_finalize (GObject *object);
-static void config_load (TrackerConfigManager *config);
-static gboolean config_save (TrackerConfigManager *config);
+static void config_load (TrackerConfigFile *config);
+static gboolean config_save (TrackerConfigFile *config);
static void config_get_property (GObject *object,
guint param_id,
GValue *value,
@@ -51,10 +51,10 @@ enum {
PROP_DOMAIN
};
-G_DEFINE_TYPE (TrackerConfigManager, tracker_config_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TrackerConfigFile, tracker_config_file, G_TYPE_OBJECT);
static void
-tracker_config_manager_class_init (TrackerConfigManagerClass *klass)
+tracker_config_file_class_init (TrackerConfigFileClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -71,13 +71,13 @@ tracker_config_manager_class_init (TrackerConfigManagerClass *klass)
g_get_application_name (),
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
- g_type_class_add_private (object_class, sizeof (TrackerConfigManagerPrivate));
+ g_type_class_add_private (object_class, sizeof (TrackerConfigFilePrivate));
}
static void
-tracker_config_manager_init (TrackerConfigManager *manager)
+tracker_config_file_init (TrackerConfigFile *file)
{
- manager->key_file = g_key_file_new ();
+ file->key_file = g_key_file_new ();
}
static void
@@ -86,9 +86,9 @@ config_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- TrackerConfigManagerPrivate *priv;
+ TrackerConfigFilePrivate *priv;
- priv = TRACKER_CONFIG_MANAGER_GET_PRIVATE (object);
+ priv = TRACKER_CONFIG_FILE_GET_PRIVATE (object);
switch (param_id) {
case PROP_DOMAIN:
@@ -107,9 +107,9 @@ config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- TrackerConfigManagerPrivate *priv;
+ TrackerConfigFilePrivate *priv;
- priv = TRACKER_CONFIG_MANAGER_GET_PRIVATE (object);
+ priv = TRACKER_CONFIG_FILE_GET_PRIVATE (object);
switch (param_id) {
case PROP_DOMAIN:
@@ -127,33 +127,33 @@ config_set_property (GObject *object,
static void
config_finalize (GObject *object)
{
- TrackerConfigManager *manager;
- TrackerConfigManagerPrivate *priv;
+ TrackerConfigFile *file;
+ TrackerConfigFilePrivate *priv;
- manager = TRACKER_CONFIG_MANAGER (object);
- priv = TRACKER_CONFIG_MANAGER_GET_PRIVATE (manager);
+ file = TRACKER_CONFIG_FILE (object);
+ priv = TRACKER_CONFIG_FILE_GET_PRIVATE (file);
- if (manager->key_file) {
- g_key_file_free (manager->key_file);
+ if (file->key_file) {
+ g_key_file_free (file->key_file);
}
- if (manager->monitor) {
- g_object_unref (manager->monitor);
+ if (file->monitor) {
+ g_object_unref (file->monitor);
}
- if (manager->file) {
- g_object_unref (manager->file);
+ if (file->file) {
+ g_object_unref (file->file);
}
g_free (priv->domain);
- (G_OBJECT_CLASS (tracker_config_manager_parent_class)->finalize) (object);
+ (G_OBJECT_CLASS (tracker_config_file_parent_class)->finalize) (object);
}
static void
config_constructed (GObject *object)
{
- config_load (TRACKER_CONFIG_MANAGER (object));
+ config_load (TRACKER_CONFIG_FILE (object));
}
static gchar *
@@ -180,40 +180,40 @@ config_dir_ensure_exists_and_return (void)
static void
config_changed_cb (GFileMonitor *monitor,
- GFile *file,
+ GFile *this_file,
GFile *other_file,
GFileMonitorEvent event_type,
gpointer user_data)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gchar *filename;
- manager = TRACKER_CONFIG_MANAGER (user_data);
+ file = TRACKER_CONFIG_FILE (user_data);
/* Do we recreate if the file is deleted? */
switch (event_type) {
case G_FILE_MONITOR_EVENT_CHANGED:
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
- manager->file_exists = TRUE;
+ file->file_exists = TRUE;
- filename = g_file_get_path (file);
+ filename = g_file_get_path (this_file);
g_message ("Config file changed:'%s', reloading settings...",
filename);
g_free (filename);
- config_load (manager);
+ config_load (file);
break;
case G_FILE_MONITOR_EVENT_DELETED:
- manager->file_exists = FALSE;
+ file->file_exists = FALSE;
break;
case G_FILE_MONITOR_EVENT_CREATED:
case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
case G_FILE_MONITOR_EVENT_UNMOUNTED:
- manager->file_exists = TRUE;
+ file->file_exists = TRUE;
default:
break;
@@ -221,9 +221,9 @@ config_changed_cb (GFileMonitor *monitor,
}
static void
-config_load (TrackerConfigManager *manager)
+config_load (TrackerConfigFile *file)
{
- TrackerConfigManagerPrivate *priv;
+ TrackerConfigFilePrivate *priv;
GError *error = NULL;
gchar *basename;
gchar *filename;
@@ -237,7 +237,7 @@ config_load (TrackerConfigManager *manager)
return;
}
- priv = TRACKER_CONFIG_MANAGER_GET_PRIVATE (manager);
+ priv = TRACKER_CONFIG_FILE_GET_PRIVATE (file);
basename = g_strdup_printf ("%s.cfg", priv->domain);
filename = g_build_filename (directory, basename, NULL);
@@ -245,32 +245,32 @@ config_load (TrackerConfigManager *manager)
g_free (directory);
/* Add file monitoring for changes */
- if (!manager->file) {
- manager->file = g_file_new_for_path (filename);
+ if (!file->file) {
+ file->file = g_file_new_for_path (filename);
}
- if (!manager->monitor) {
+ if (!file->monitor) {
g_message ("Setting up monitor for changes to config file:'%s'",
filename);
- manager->monitor = g_file_monitor_file (manager->file,
+ file->monitor = g_file_monitor_file (file->file,
G_FILE_MONITOR_NONE,
NULL,
NULL);
- g_signal_connect (manager->monitor, "changed",
+ g_signal_connect (file->monitor, "changed",
G_CALLBACK (config_changed_cb),
- manager);
+ file);
}
/* Load options */
- g_key_file_load_from_file (manager->key_file,
+ g_key_file_load_from_file (file->key_file,
filename,
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error);
/* We force an overwrite in cases of error */
- manager->file_exists = error ? FALSE : TRUE;
+ file->file_exists = error ? FALSE : TRUE;
if (error) {
g_error_free (error);
@@ -280,14 +280,14 @@ config_load (TrackerConfigManager *manager)
}
static gboolean
-config_save (TrackerConfigManager *manager)
+config_save (TrackerConfigFile *file)
{
GError *error = NULL;
gchar *filename;
gchar *data;
gsize size;
- if (!manager->key_file) {
+ if (!file->key_file) {
g_critical ("Could not save config, GKeyFile was NULL, has the config been loaded?");
return FALSE;
@@ -300,7 +300,7 @@ config_save (TrackerConfigManager *manager)
g_message ("Saving config to disk...");
/* Do the actual saving to disk now */
- data = g_key_file_to_data (manager->key_file, &size, &error);
+ data = g_key_file_to_data (file->key_file, &size, &error);
if (error) {
g_warning ("Could not get config data to write to file, %s",
error->message);
@@ -309,7 +309,7 @@ config_save (TrackerConfigManager *manager)
return FALSE;
}
- filename = g_file_get_path (manager->file);
+ filename = g_file_get_path (file->file);
g_file_set_contents (filename, data, size, &error);
g_free (data);
@@ -335,19 +335,19 @@ config_save (TrackerConfigManager *manager)
}
/**
- * tracker_config_manager_new:
+ * tracker_config_file_new:
*
* Creates a new GObject for handling Tracker's config file.
*
- * Return value: A new TrackerConfigManager object. Must be unreferenced when
+ * Return value: A new TrackerConfigFile object. Must be unreferenced when
* finished with.
*/
-TrackerConfigManager *
-tracker_config_manager_new (const gchar *domain)
+TrackerConfigFile *
+tracker_config_file_new (const gchar *domain)
{
- TrackerConfigManager *config;
+ TrackerConfigFile *config;
- config = g_object_new (TRACKER_TYPE_CONFIG_MANAGER,
+ config = g_object_new (TRACKER_TYPE_CONFIG_FILE,
"domain", domain,
NULL);
@@ -355,17 +355,17 @@ tracker_config_manager_new (const gchar *domain)
}
/**
- * tracker_config_manager_save:
- * @config: a #TrackerConfigManager
+ * tracker_config_file_save:
+ * @config: a #TrackerConfigFile
*
- * Writes the configuration stored in TrackerConfigManager to disk.
+ * Writes the configuration stored in TrackerConfigFile to disk.
*
* Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
-tracker_config_manager_save (TrackerConfigManager *config)
+tracker_config_file_save (TrackerConfigFile *config)
{
- g_return_val_if_fail (TRACKER_IS_CONFIG_MANAGER (config), FALSE);
+ g_return_val_if_fail (TRACKER_IS_CONFIG_FILE (config), FALSE);
return config_save (config);
}
diff --git a/src/libtracker-common/tracker-config-file.h b/src/libtracker-common/tracker-config-file.h
new file mode 100644
index 0000000..b46fee1
--- /dev/null
+++ b/src/libtracker-common/tracker-config-file.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __TRACKER_CONFIG_FILE_H__
+#define __TRACKER_CONFIG_FILE_H__
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define TRACKER_TYPE_CONFIG_FILE (tracker_config_file_get_type ())
+#define TRACKER_CONFIG_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFile))
+#define TRACKER_CONFIG_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
+#define TRACKER_IS_CONFIG_FILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG_FILE))
+#define TRACKER_IS_CONFIG_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG_FILE))
+#define TRACKER_CONFIG_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
+
+typedef struct _TrackerConfigFile TrackerConfigFile;
+typedef struct _TrackerConfigFileClass TrackerConfigFileClass;
+
+struct _TrackerConfigFile {
+ GObject parent;
+
+ GFile *file;
+ GFileMonitor *monitor;
+
+ gboolean file_exists;
+
+ GKeyFile *key_file;
+};
+
+struct _TrackerConfigFileClass {
+ GObjectClass parent_class;
+};
+
+GType tracker_config_file_get_type (void) G_GNUC_CONST;
+
+TrackerConfigFile *tracker_config_file_new (const gchar *domain);
+gboolean tracker_config_file_save (TrackerConfigFile *config);
+
+G_END_DECLS
+
+#endif /* __TRACKER_CONFIG_FILE_H__ */
diff --git a/src/libtracker-common/tracker-config-utils.c b/src/libtracker-common/tracker-keyfile-object.c
similarity index 61%
rename from src/libtracker-common/tracker-config-utils.c
rename to src/libtracker-common/tracker-keyfile-object.c
index c69b111..17f1af3 100644
--- a/src/libtracker-common/tracker-config-utils.c
+++ b/src/libtracker-common/tracker-keyfile-object.c
@@ -23,11 +23,10 @@
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-type-utils.h>
-#include "tracker-config-utils.h"
+#include "tracker-keyfile-object.h"
static GSList *
-config_string_list_to_gslist (const gchar **value,
- gboolean is_directory_list)
+directory_string_list_to_gslist (const gchar **value)
{
GSList *list = NULL;
gint i;
@@ -45,11 +44,6 @@ config_string_list_to_gslist (const gchar **value,
continue;
}
- if (!is_directory_list) {
- list = g_slist_prepend (list, g_strdup (str));
- continue;
- }
-
/* For directories we validate any special characters,
* for example '~' and '../../'
*/
@@ -63,16 +57,16 @@ config_string_list_to_gslist (const gchar **value,
}
const gchar *
-tracker_config_blurb (gpointer config,
- const gchar *property)
+tracker_keyfile_object_blurb (gpointer object,
+ const gchar *property)
{
GObjectClass *klass;
GParamSpec *spec;
- g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+ g_return_val_if_fail (G_IS_OBJECT (object), NULL);
g_return_val_if_fail (property != NULL, NULL);
-
- klass = G_OBJECT_GET_CLASS (config);
+
+ klass = G_OBJECT_GET_CLASS (object);
spec = g_object_class_find_property (G_OBJECT_CLASS (klass), property);
g_return_val_if_fail (spec != NULL, NULL);
@@ -80,17 +74,17 @@ tracker_config_blurb (gpointer config,
}
gboolean
-tracker_config_default_boolean (gpointer config,
- const gchar *property)
+tracker_keyfile_object_default_boolean (gpointer object,
+ const gchar *property)
{
GObjectClass *klass;
GParamSpec *spec;
GParamSpecBoolean *bspec;
- g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
+ g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
g_return_val_if_fail (property != NULL, FALSE);
- klass = G_OBJECT_GET_CLASS (config);
+ klass = G_OBJECT_GET_CLASS (object);
spec = g_object_class_find_property (G_OBJECT_CLASS (klass), property);
g_return_val_if_fail (spec != NULL, FALSE);
@@ -101,17 +95,17 @@ tracker_config_default_boolean (gpointer config,
}
gint
-tracker_config_default_int (gpointer config,
- const gchar *property)
+tracker_keyfile_object_default_int (gpointer object,
+ const gchar *property)
{
GObjectClass *klass;
GParamSpec *spec;
GParamSpecInt *ispec;
- g_return_val_if_fail (G_IS_OBJECT (config), 0);
+ g_return_val_if_fail (G_IS_OBJECT (object), 0);
g_return_val_if_fail (property != NULL, 0);
- klass = G_OBJECT_GET_CLASS (config);
+ klass = G_OBJECT_GET_CLASS (object);
spec = g_object_class_find_property (G_OBJECT_CLASS (klass), property);
g_return_val_if_fail (spec != NULL, 0);
@@ -122,11 +116,11 @@ tracker_config_default_int (gpointer config,
}
gboolean
-tracker_config_validate_int (gpointer config,
- const gchar *property,
- gint value)
+tracker_keyfile_object_validate_int (gpointer object,
+ const gchar *property,
+ gint value)
{
- g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
+ g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
g_return_val_if_fail (property != NULL, FALSE);
#ifdef G_DISABLE_CHECKS
@@ -134,7 +128,7 @@ tracker_config_validate_int (gpointer config,
GValue value = { 0 };
gboolean valid;
- spec = g_object_class_find_property (G_OBJECT_CLASS (config), property);
+ spec = g_object_class_find_property (G_OBJECT_CLASS (object), property);
g_return_val_if_fail (spec != NULL, FALSE);
g_value_init (&value, spec->value_type);
@@ -149,16 +143,16 @@ tracker_config_validate_int (gpointer config,
}
void
-tracker_config_load_int (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_load_int (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
GError *error = NULL;
gint value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
@@ -166,25 +160,25 @@ tracker_config_load_int (gpointer config,
value = g_key_file_get_integer (key_file, group, key, &error);
if (!error) {
- g_object_set (G_OBJECT (config), property, value, NULL);
+ g_object_set (G_OBJECT (object), property, value, NULL);
} else {
- g_message ("Couldn't load config option '%s' (int) in group '%s', %s",
+ g_message ("Couldn't load object property '%s' (int) in group '%s', %s",
property, group, error->message);
g_error_free (error);
}
}
void
-tracker_config_load_boolean (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_load_boolean (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
GError *error = NULL;
gboolean value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
@@ -192,25 +186,25 @@ tracker_config_load_boolean (gpointer config,
value = g_key_file_get_boolean (key_file, group, key, &error);
if (!error) {
- g_object_set (G_OBJECT (config), property, value, NULL);
+ g_object_set (G_OBJECT (object), property, value, NULL);
} else {
- g_message ("Couldn't load config option '%s' (bool) in group '%s', %s",
+ g_message ("Couldn't load object property '%s' (bool) in group '%s', %s",
property, group, error->message);
g_error_free (error);
}
}
void
-tracker_config_load_string (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_load_string (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
GError *error = NULL;
gchar *value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
@@ -218,9 +212,9 @@ tracker_config_load_string (gpointer config,
value = g_key_file_get_string (key_file, group, key, &error);
if (!error) {
- g_object_set (G_OBJECT (config), property, value, NULL);
+ g_object_set (G_OBJECT (object), property, value, NULL);
} else {
- g_message ("Couldn't load config option '%s' (string) in group '%s', %s",
+ g_message ("Couldn't load object property '%s' (string) in group '%s', %s",
property, group, error->message);
g_error_free (error);
}
@@ -229,112 +223,116 @@ tracker_config_load_string (gpointer config,
}
void
-tracker_config_load_string_list (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key,
- gboolean is_directory_list)
+tracker_keyfile_object_load_string_list (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key,
+ gboolean is_directory_list)
{
GSList *l;
gchar **value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
g_return_if_fail (key != NULL);
value = g_key_file_get_string_list (key_file, group, key, NULL, NULL);
- l = config_string_list_to_gslist ((const gchar **) value, is_directory_list);
- g_strfreev (value);
+ if (is_directory_list) {
+ l = directory_string_list_to_gslist ((const gchar **) value);
+ } else {
+ l = tracker_string_list_to_gslist (value, -1);
+}
+g_strfreev (value);
- if (l) {
- GSList *filtered;
+if (l) {
+ GSList *filtered;
- /* Should we make the basename (2nd argument) here
- * part of this function's API?
- */
- filtered = tracker_path_list_filter_duplicates (l, ".");
+ /* Should we make the basename (2nd argument) here
+ * part of this function's API?
+ */
+ filtered = tracker_path_list_filter_duplicates (l, ".");
- g_slist_foreach (l, (GFunc) g_free, NULL);
- g_slist_free (l);
+ g_slist_foreach (l, (GFunc) g_free, NULL);
+ g_slist_free (l);
- l = filtered;
- }
+ l = filtered;
+}
- g_object_set (G_OBJECT (config), property, l, NULL);
+g_object_set (G_OBJECT (object), property, l, NULL);
}
void
-tracker_config_save_int (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_save_int (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
gint value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
g_return_if_fail (key != NULL);
- g_object_get (G_OBJECT (config), property, &value, NULL);
+ g_object_get (G_OBJECT (object), property, &value, NULL);
g_key_file_set_integer (key_file, group, key, value);
}
void
-tracker_config_save_boolean (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_save_boolean (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
gboolean value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
g_return_if_fail (key != NULL);
- g_object_get (G_OBJECT (config), property, &value, NULL);
+ g_object_get (G_OBJECT (object), property, &value, NULL);
g_key_file_set_boolean (key_file, group, key, value);
}
void
-tracker_config_save_string (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_save_string (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
gchar *value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
g_return_if_fail (key != NULL);
- g_object_get (G_OBJECT (config), property, &value, NULL);
+ g_object_get (G_OBJECT (object), property, &value, NULL);
g_key_file_set_string (key_file, group, key, value);
g_free (value);
}
void
-tracker_config_save_string_list (gpointer config,
- const gchar *property,
- GKeyFile *key_file,
- const gchar *group,
- const gchar *key)
+tracker_keyfile_object_save_string_list (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key)
{
GSList *list;
gchar **value;
- g_return_if_fail (G_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property != NULL);
g_return_if_fail (key_file != NULL);
g_return_if_fail (group != NULL);
diff --git a/src/libtracker-common/tracker-keyfile-object.h b/src/libtracker-common/tracker-keyfile-object.h
new file mode 100644
index 0000000..5ebb55c
--- /dev/null
+++ b/src/libtracker-common/tracker-keyfile-object.h
@@ -0,0 +1,81 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __TRACKER_KEYFILE_OBJECT_H__
+#define __TRACKER_KEYFILE_OBJECT_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+const gchar *tracker_keyfile_object_blurb (gpointer object,
+ const gchar *property);
+gboolean tracker_keyfile_object_default_boolean (gpointer object,
+ const gchar *property);
+gint tracker_keyfile_object_default_int (gpointer object,
+ const gchar *property);
+gboolean tracker_keyfile_object_validate_int (gpointer object,
+ const gchar *property,
+ gint value);
+void tracker_keyfile_object_load_int (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_load_boolean (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_load_string (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_load_string_list (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key,
+ gboolean is_directory_list);
+void tracker_keyfile_object_save_int (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_save_boolean (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_save_string (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+void tracker_keyfile_object_save_string_list (gpointer object,
+ const gchar *property,
+ GKeyFile *key_file,
+ const gchar *group,
+ const gchar *key);
+
+G_END_DECLS
+
+#endif /* __TRACKER_KEYFILE_OBJECT_H__ */
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index 4bc6246..186ce3b 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <libtracker-common/tracker-config-utils.h>
+#include <libtracker-common/tracker-keyfile-object.h>
#include "tracker-config.h"
@@ -71,7 +71,7 @@ static ObjectToKeyFile conversions[] = {
{ G_TYPE_INT, "verbosity", GROUP_GENERAL, "Verbosity" },
};
-G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_MANAGER);
+G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_FILE);
static void
tracker_config_class_init (TrackerConfigClass *klass)
@@ -186,8 +186,8 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_integer (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_int (config,
- conversions[i].property));
+ tracker_keyfile_object_default_int (config,
+ conversions[i].property));
break;
default:
@@ -197,8 +197,8 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_comment (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_blurb (config,
- conversions[i].property),
+ tracker_keyfile_object_blurb (config,
+ conversions[i].property),
NULL);
}
}
@@ -206,31 +206,31 @@ config_create_with_defaults (TrackerConfig *config,
static void
config_load (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
- config_create_with_defaults (config, manager->key_file, FALSE);
+ file = TRACKER_CONFIG_FILE (config);
+ config_create_with_defaults (config, file->key_file, FALSE);
- if (!manager->file_exists) {
- tracker_config_manager_save (manager);
+ if (!file->file_exists) {
+ tracker_config_file_save (file);
}
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
- has_key = g_key_file_has_key (manager->key_file,
+ has_key = g_key_file_has_key (file->key_file,
conversions[i].group,
conversions[i].key,
NULL);
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_load_int (G_OBJECT (manager),
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_load_int (G_OBJECT (file),
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
default:
@@ -243,12 +243,12 @@ config_load (TrackerConfig *config)
static gboolean
config_save (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
+ file = TRACKER_CONFIG_FILE (config);
- if (!manager->key_file) {
+ if (!file->key_file) {
g_critical ("Could not save config, GKeyFile was NULL, has the config been loaded?");
return FALSE;
@@ -259,11 +259,11 @@ config_save (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_save_int (manager,
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_save_int (file,
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
default:
@@ -272,7 +272,7 @@ config_save (TrackerConfig *config)
}
}
- return tracker_config_manager_save (manager);
+ return tracker_config_file_save (file);
}
TrackerConfig *
@@ -309,7 +309,7 @@ tracker_config_set_verbosity (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "verbosity", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "verbosity", value)) {
return;
}
diff --git a/src/tracker-extract/tracker-config.h b/src/tracker-extract/tracker-config.h
index 0cfd20d..0918240 100644
--- a/src/tracker-extract/tracker-config.h
+++ b/src/tracker-extract/tracker-config.h
@@ -23,7 +23,7 @@
#include <glib-object.h>
-#include <libtracker-common/tracker-config-manager.h>
+#include <libtracker-common/tracker-config-file.h>
G_BEGIN_DECLS
@@ -38,11 +38,11 @@ typedef struct TrackerConfig TrackerConfig;
typedef struct TrackerConfigClass TrackerConfigClass;
struct TrackerConfig {
- TrackerConfigManager parent;
+ TrackerConfigFile parent;
};
struct TrackerConfigClass {
- TrackerConfigManagerClass parent_class;
+ TrackerConfigFileClass parent_class;
};
GType tracker_config_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-fts/tracker-fts-config.c b/src/tracker-fts/tracker-fts-config.c
index b5b2485..8691306 100644
--- a/src/tracker-fts/tracker-fts-config.c
+++ b/src/tracker-fts/tracker-fts-config.c
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-config-utils.h>
+#include <libtracker-common/tracker-keyfile-object.h>
#include "tracker-fts-config.h"
@@ -86,7 +86,7 @@ static ObjectToKeyFile conversions[] = {
{ G_TYPE_INT, "max-words-to-index", GROUP_INDEXING, "MaxWordsToIndex" },
};
-G_DEFINE_TYPE (TrackerFTSConfig, tracker_fts_config, TRACKER_TYPE_CONFIG_MANAGER);
+G_DEFINE_TYPE (TrackerFTSConfig, tracker_fts_config, TRACKER_TYPE_CONFIG_FILE);
static void
tracker_fts_config_class_init (TrackerFTSConfigClass *klass)
@@ -233,8 +233,8 @@ config_create_with_defaults (TrackerFTSConfig *config,
g_key_file_set_integer (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_int (config,
- conversions[i].property));
+ tracker_keyfile_object_default_int (config,
+ conversions[i].property));
break;
default:
@@ -245,8 +245,8 @@ config_create_with_defaults (TrackerFTSConfig *config,
g_key_file_set_comment (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_blurb (config,
- conversions[i].property),
+ tracker_keyfile_object_blurb (config,
+ conversions[i].property),
NULL);
}
}
@@ -254,31 +254,31 @@ config_create_with_defaults (TrackerFTSConfig *config,
static void
config_load (TrackerFTSConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
- config_create_with_defaults (config, manager->key_file, FALSE);
+ file = TRACKER_CONFIG_FILE (config);
+ config_create_with_defaults (config, file->key_file, FALSE);
- if (!manager->file_exists) {
- tracker_config_manager_save (manager);
+ if (!file->file_exists) {
+ tracker_config_file_save (file);
}
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
- has_key = g_key_file_has_key (manager->key_file,
+ has_key = g_key_file_has_key (file->key_file,
conversions[i].group,
conversions[i].key,
NULL);
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_load_int (G_OBJECT (manager),
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_load_int (G_OBJECT (file),
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
default:
@@ -291,12 +291,12 @@ config_load (TrackerFTSConfig *config)
static gboolean
config_save (TrackerFTSConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
+ file = TRACKER_CONFIG_FILE (config);
- if (!manager->key_file) {
+ if (!file->key_file) {
g_critical ("Could not save config, GKeyFile was NULL, has the config been loaded?");
return FALSE;
@@ -307,11 +307,11 @@ config_save (TrackerFTSConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_save_int (manager,
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_save_int (file,
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
default:
@@ -320,7 +320,7 @@ config_save (TrackerFTSConfig *config)
}
}
- return tracker_config_manager_save (TRACKER_CONFIG_MANAGER (config));
+ return tracker_config_file_save (TRACKER_CONFIG_FILE (config));
}
TrackerFTSConfig *
@@ -383,7 +383,7 @@ tracker_fts_config_set_min_word_length (TrackerFTSConfig *config,
g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
- if (!tracker_config_validate_int (config, "min-word-length", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "min-word-length", value)) {
return;
}
@@ -401,7 +401,7 @@ tracker_fts_config_set_max_word_length (TrackerFTSConfig *config,
g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
- if (!tracker_config_validate_int (config, "max-word-length", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "max-word-length", value)) {
return;
}
@@ -419,7 +419,7 @@ tracker_fts_config_set_max_words_to_index (TrackerFTSConfig *config,
g_return_if_fail (TRACKER_IS_FTS_CONFIG (config));
- if (!tracker_config_validate_int (config, "max-words-to-index", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "max-words-to-index", value)) {
return;
}
diff --git a/src/tracker-fts/tracker-fts-config.h b/src/tracker-fts/tracker-fts-config.h
index 3687870..1919472 100644
--- a/src/tracker-fts/tracker-fts-config.h
+++ b/src/tracker-fts/tracker-fts-config.h
@@ -23,7 +23,7 @@
#include <glib-object.h>
-#include <libtracker-common/tracker-config-manager.h>
+#include <libtracker-common/tracker-config-file.h>
G_BEGIN_DECLS
@@ -38,11 +38,11 @@ typedef struct TrackerFTSConfig TrackerFTSConfig;
typedef struct TrackerFTSConfigClass TrackerFTSConfigClass;
struct TrackerFTSConfig {
- TrackerConfigManager parent;
+ TrackerConfigFile parent;
};
struct TrackerFTSConfigClass {
- TrackerConfigManagerClass parent_class;
+ TrackerConfigFileClass parent_class;
};
GType tracker_fts_config_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
index 21cef9e..ec58c56 100644
--- a/src/tracker-miner-fs/tracker-config.c
+++ b/src/tracker-miner-fs/tracker-config.c
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-config-utils.h>
+#include <libtracker-common/tracker-keyfile-object.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-type-utils.h>
@@ -139,7 +139,7 @@ static ObjectToKeyFile conversions[] = {
{ G_TYPE_BOOLEAN, "index-removable-devices", GROUP_INDEXING, "IndexRemovableMedia" },
};
-G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_MANAGER);
+G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_FILE);
static void
tracker_config_class_init (TrackerConfigClass *klass)
@@ -222,7 +222,7 @@ tracker_config_class_init (TrackerConfigClass *klass)
" List of disabled modules (separator=;)\n"
" The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules",
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-;
+ ;
g_object_class_install_property (object_class,
PROP_DISABLE_INDEXING_ON_BATTERY,
g_param_spec_boolean ("disable-indexing-on-battery",
@@ -338,7 +338,7 @@ config_set_property (GObject *object,
break;
case PROP_INDEX_REMOVABLE_DEVICES:
tracker_config_set_index_removable_devices (TRACKER_CONFIG (object),
- g_value_get_boolean (value));
+ g_value_get_boolean (value));
break;
default:
@@ -467,16 +467,16 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_integer (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_int (config,
- conversions[i].property));
+ tracker_keyfile_object_default_int (config,
+ conversions[i].property));
break;
case G_TYPE_BOOLEAN:
g_key_file_set_boolean (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_boolean (config,
- conversions[i].property));
+ tracker_keyfile_object_default_boolean (config,
+ conversions[i].property));
break;
case G_TYPE_POINTER:
@@ -510,8 +510,8 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_comment (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_blurb (config,
- conversions[i].property),
+ tracker_keyfile_object_blurb (config,
+ conversions[i].property),
NULL);
}
}
@@ -519,40 +519,40 @@ config_create_with_defaults (TrackerConfig *config,
static void
config_load (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
- config_create_with_defaults (config, manager->key_file, FALSE);
+ file = TRACKER_CONFIG_FILE (config);
+ config_create_with_defaults (config, file->key_file, FALSE);
- if (!manager->file_exists) {
- tracker_config_manager_save (manager);
+ if (!file->file_exists) {
+ tracker_config_file_save (file);
}
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
gboolean is_directory_list;
- has_key = g_key_file_has_key (manager->key_file,
+ has_key = g_key_file_has_key (file->key_file,
conversions[i].group,
conversions[i].key,
NULL);
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_load_int (G_OBJECT (manager),
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_load_int (G_OBJECT (file),
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_config_load_boolean (G_OBJECT (manager),
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_load_boolean (G_OBJECT (file),
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
case G_TYPE_POINTER:
@@ -562,12 +562,12 @@ config_load (TrackerConfig *config)
is_directory_list = TRUE;
}
- tracker_config_load_string_list (G_OBJECT (manager),
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key,
- is_directory_list);
+ tracker_keyfile_object_load_string_list (G_OBJECT (file),
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key,
+ is_directory_list);
break;
}
}
@@ -576,12 +576,12 @@ config_load (TrackerConfig *config)
static gboolean
config_save (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
+ file = TRACKER_CONFIG_FILE (config);
- if (!manager->key_file) {
+ if (!file->key_file) {
g_critical ("Could not save config, GKeyFile was NULL, has the config been loaded?");
return FALSE;
@@ -592,27 +592,27 @@ config_save (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_save_int (manager,
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_save_int (file,
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_config_save_boolean (manager,
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_save_boolean (file,
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
case G_TYPE_POINTER:
- tracker_config_save_string_list (manager,
- conversions[i].property,
- manager->key_file,
- conversions[i].group,
- conversions[i].key);
+ tracker_keyfile_object_save_string_list (file,
+ conversions[i].property,
+ file->key_file,
+ conversions[i].group,
+ conversions[i].key);
break;
default:
@@ -621,7 +621,7 @@ config_save (TrackerConfig *config)
}
}
- return tracker_config_manager_save (manager);
+ return tracker_config_file_save (file);
}
TrackerConfig *
@@ -814,7 +814,7 @@ tracker_config_set_verbosity (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "verbosity", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "verbosity", value)) {
return;
}
@@ -832,7 +832,7 @@ tracker_config_set_initial_sleep (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "initial-sleep", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "initial-sleep", value)) {
return;
}
@@ -864,7 +864,7 @@ tracker_config_set_throttle (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "throttle", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "throttle", value)) {
return;
}
@@ -924,7 +924,7 @@ tracker_config_set_low_disk_space_limit (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "low-disk-space-limit", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "low-disk-space-limit", value)) {
return;
}
@@ -950,7 +950,7 @@ tracker_config_set_index_mounted_directories (TrackerConfig *config,
void
tracker_config_set_index_removable_devices (TrackerConfig *config,
- gboolean value)
+ gboolean value)
{
TrackerConfigPrivate *priv;
diff --git a/src/tracker-miner-fs/tracker-config.h b/src/tracker-miner-fs/tracker-config.h
index 0390ac4..446e2b0 100644
--- a/src/tracker-miner-fs/tracker-config.h
+++ b/src/tracker-miner-fs/tracker-config.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2009, Nokia (urho konttori nokia com)
+ * Copyright (C) 2009%, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -23,7 +23,7 @@
#include <glib-object.h>
-#include <libtracker-common/tracker-config-manager.h>
+#include <libtracker-common/tracker-config-file.h>
G_BEGIN_DECLS
@@ -38,11 +38,11 @@ typedef struct TrackerConfig TrackerConfig;
typedef struct TrackerConfigClass TrackerConfigClass;
struct TrackerConfig {
- TrackerConfigManager parent;
+ TrackerConfigFile parent;
};
struct TrackerConfigClass {
- TrackerConfigManagerClass parent_class;
+ TrackerConfigFileClass parent_class;
};
GType tracker_config_get_type (void) G_GNUC_CONST;
diff --git a/src/tracker-store/tracker-config.c b/src/tracker-store/tracker-config.c
index 81a2345..c4dd2df 100644
--- a/src/tracker-store/tracker-config.c
+++ b/src/tracker-store/tracker-config.c
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-config-utils.h>
+#include <libtracker-common/tracker-keyfile-object.h>
#include "tracker-config.h"
@@ -83,7 +83,7 @@ static ObjectToKeyFile conversions[] = {
{ G_TYPE_BOOLEAN, "low-memory-mode", GROUP_GENERAL, "LowMemoryMode" },
};
-G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_MANAGER);
+G_DEFINE_TYPE (TrackerConfig, tracker_config, TRACKER_TYPE_CONFIG_FILE);
static void
tracker_config_class_init (TrackerConfigClass *klass)
@@ -212,16 +212,16 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_integer (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_int (config,
- conversions[i].property));
+ tracker_keyfile_object_default_int (config,
+ conversions[i].property));
break;
case G_TYPE_BOOLEAN:
g_key_file_set_boolean (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_default_boolean (config,
- conversions[i].property));
+ tracker_keyfile_object_default_boolean (config,
+ conversions[i].property));
break;
default:
@@ -232,7 +232,7 @@ config_create_with_defaults (TrackerConfig *config,
g_key_file_set_comment (key_file,
conversions[i].group,
conversions[i].key,
- tracker_config_blurb (config,
+ tracker_keyfile_object_blurb (config,
conversions[i].property),
NULL);
}
@@ -241,37 +241,37 @@ config_create_with_defaults (TrackerConfig *config,
static void
config_load (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
- config_create_with_defaults (config, manager->key_file, FALSE);
+ file = TRACKER_CONFIG_FILE (config);
+ config_create_with_defaults (config, file->key_file, FALSE);
- if (!manager->file_exists) {
- tracker_config_manager_save (manager);
+ if (!file->file_exists) {
+ tracker_config_file_save (file);
}
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
- has_key = g_key_file_has_key (manager->key_file,
+ has_key = g_key_file_has_key (file->key_file,
conversions[i].group,
conversions[i].key,
NULL);
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_load_int (G_OBJECT (manager),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
- manager->key_file,
+ file->key_file,
conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_config_load_boolean (G_OBJECT (manager),
+ tracker_keyfile_object_load_boolean (G_OBJECT (file),
conversions[i].property,
- manager->key_file,
+ file->key_file,
conversions[i].group,
conversions[i].key);
break;
@@ -286,12 +286,12 @@ config_load (TrackerConfig *config)
static gboolean
config_save (TrackerConfig *config)
{
- TrackerConfigManager *manager;
+ TrackerConfigFile *file;
gint i;
- manager = TRACKER_CONFIG_MANAGER (config);
+ file = TRACKER_CONFIG_FILE (config);
- if (!manager->key_file) {
+ if (!file->key_file) {
g_critical ("Could not save config, GKeyFile was NULL, has the config been loaded?");
return FALSE;
@@ -302,17 +302,17 @@ config_save (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_config_save_int (manager,
+ tracker_keyfile_object_save_int (file,
conversions[i].property,
- manager->key_file,
+ file->key_file,
conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_config_save_boolean (manager,
+ tracker_keyfile_object_save_boolean (file,
conversions[i].property,
- manager->key_file,
+ file->key_file,
conversions[i].group,
conversions[i].key);
break;
@@ -323,7 +323,7 @@ config_save (TrackerConfig *config)
}
}
- return tracker_config_manager_save (TRACKER_CONFIG_MANAGER (config));
+ return tracker_config_file_save (TRACKER_CONFIG_FILE (config));
}
TrackerConfig *
@@ -372,7 +372,7 @@ tracker_config_set_verbosity (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
- if (!tracker_config_validate_int (config, "verbosity", value)) {
+ if (!tracker_keyfile_object_validate_int (config, "verbosity", value)) {
return;
}
diff --git a/src/tracker-store/tracker-config.h b/src/tracker-store/tracker-config.h
index 81dacca..7ba8dcf 100644
--- a/src/tracker-store/tracker-config.h
+++ b/src/tracker-store/tracker-config.h
@@ -23,7 +23,7 @@
#include <glib-object.h>
-#include <libtracker-common/tracker-config-manager.h>
+#include <libtracker-common/tracker-config-file.h>
G_BEGIN_DECLS
@@ -38,11 +38,11 @@ typedef struct TrackerConfig TrackerConfig;
typedef struct TrackerConfigClass TrackerConfigClass;
struct TrackerConfig {
- TrackerConfigManager parent;
+ TrackerConfigFile parent;
};
struct TrackerConfigClass {
- TrackerConfigManagerClass parent_class;
+ TrackerConfigFileClass parent_class;
};
GType tracker_config_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
