From 9d8fde62a1f5fd118ebeefee7e3cc5b4f836524e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sami=20M=C3=A4ki?= Date: Thu, 8 Jan 2009 12:29:48 +0200 Subject: [PATCH] Command chain reading stuff. --- irreco/src/core/irreco_cmd_chain_manager.c | 13 +++++++++---- irreco/src/core/irreco_cmd_chain_manager.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/irreco/src/core/irreco_cmd_chain_manager.c b/irreco/src/core/irreco_cmd_chain_manager.c index d1425ff0..2ac9d43b 100644 --- a/irreco/src/core/irreco_cmd_chain_manager.c +++ b/irreco/src/core/irreco_cmd_chain_manager.c @@ -239,8 +239,10 @@ gboolean irreco_cmd_chain_manager_to_config(IrrecoCmdChainManager *self) g_hash_table_foreach(self->table, irreco_cmd_chain_manager_to_config_foreach, keyfile); + success = irreco_gkeyfile_write_to_config_file( keyfile, "irreco", irreco_config_cmd_chain_file); + g_key_file_free(keyfile); IRRECO_RETURN_BOOL(success); } @@ -261,8 +263,9 @@ static void irreco_cmd_chain_manager_to_config_foreach(gpointer key, /** * Read command chains from disk. */ -gboolean irreco_cmd_chain_manager_from_config(IrrecoData *irreco_data) +gboolean irreco_cmd_chain_manager_from_config(IrrecoDirForeachData *dir_data) { + IrrecoData *irreco_data = (IrrecoData *)dir_data->user_data_1; IrrecoCmdChainManager *self = irreco_data->cmd_chain_manager; guint i; IrrecoKeyFile *keyfile = NULL; @@ -273,9 +276,10 @@ gboolean irreco_cmd_chain_manager_from_config(IrrecoData *irreco_data) IRRECO_ENTER /* Read config file into IrrecoKeyFile. */ + /* g_sprintf(config_dir, "%s", dir_data->directory); */ config_dir = irreco_get_config_dir("irreco"); - config_file = irreco_get_config_file( - "irreco", irreco_config_cmd_chain_file); + config_file = irreco_get_config_file("irreco", dir_data->filename); + keyfile = irreco_keyfile_create(config_dir, config_file, NULL); if (config_dir == NULL || config_file == NULL || keyfile == NULL) { g_free(config_dir); @@ -301,7 +305,8 @@ gboolean irreco_cmd_chain_manager_from_config(IrrecoData *irreco_data) /* Read command chain from keyfile. */ irreco_keyfile_set_group(keyfile, group); - chain = irreco_cmd_chain_new_from_config(keyfile, irreco_data); + chain = irreco_cmd_chain_new_from_config(keyfile, + dir_data->user_data_1); /** * Copy chain into ID-mapped chain. diff --git a/irreco/src/core/irreco_cmd_chain_manager.h b/irreco/src/core/irreco_cmd_chain_manager.h index a499cd35..7d3deb87 100644 --- a/irreco/src/core/irreco_cmd_chain_manager.h +++ b/irreco/src/core/irreco_cmd_chain_manager.h @@ -95,7 +95,7 @@ IrrecoCmdChainId irreco_cmd_chain_manager_find_chain( gboolean irreco_cmd_chain_manager_to_config( IrrecoCmdChainManager *self); gboolean irreco_cmd_chain_manager_from_config( - IrrecoData *irreco_data); + IrrecoDirForeachData *dir_data); #endif /* __IRRECO_CMD_CHAIN_MANAGER_H__ */ -- 2.11.4.GIT