aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

fixed config file handling

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1485 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-05-11 17:04:14 +00:00 committed by cras
parent 1f23c05ee7
commit bffe51861f
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/fe-common/core/keyboard.c
View File

@ -344,6 +344,21 @@ void key_configure_thaw(void)
key_states_rescan(); key_states_rescan();
} }
static void key_configure_destroy(KEY_REC *rec)
{
g_return_if_fail(rec != NULL);
rec->info->keys = g_slist_remove(rec->info->keys, rec);
g_hash_table_remove(keys, rec->key);
if (!key_config_frozen)
key_states_rescan();
g_free_not_null(rec->data);
g_free(rec->key);
g_free(rec);
}
/* Configure new key */ /* Configure new key */
static void key_configure_create(const char *id, const char *key, static void key_configure_create(const char *id, const char *key,
const char *data) const char *data)
@ -358,7 +373,9 @@ static void key_configure_create(const char *id, const char *key,
if (info == NULL) if (info == NULL)
return; return;
key_configure_remove(key); rec = g_hash_table_lookup(keys, key);
if (rec != NULL)
key_configure_destroy(rec);
rec = g_new0(KEY_REC, 1); rec = g_new0(KEY_REC, 1);
rec->key = g_strdup(key); rec->key = g_strdup(key);
@ -381,21 +398,6 @@ void key_configure_add(const char *id, const char *key, const char *data)
keyconfig_save(id, key, data); keyconfig_save(id, key, data);
} }
static void key_configure_destroy(KEY_REC *rec)
{
g_return_if_fail(rec != NULL);
rec->info->keys = g_slist_remove(rec->info->keys, rec);
g_hash_table_remove(keys, rec->key);
if (!key_config_frozen)
key_states_rescan();
g_free_not_null(rec->data);
g_free(rec->key);
g_free(rec);
}
/* Remove key */ /* Remove key */
void key_configure_remove(const char *key) void key_configure_remove(const char *key)
{ {
@ -698,7 +700,7 @@ static void keyboard_reset_defaults(void)
static void read_keyboard_config(void) static void read_keyboard_config(void)
{ {
CONFIG_NODE *node, *tmpnode; CONFIG_NODE *node;
GSList *tmp; GSList *tmp;
char *id, *data; char *id, *data;
@ -713,9 +715,9 @@ static void read_keyboard_config(void)
} }
/* FIXME: backward "compatibility" - remove after irssi .99 */ /* FIXME: backward "compatibility" - remove after irssi .99 */
tmpnode = node->value; tmp = node->value;
if (tmpnode != NULL && if (tmp != NULL &&
config_node_get_str(tmpnode->value, "id", NULL) == NULL) { config_node_get_str(tmp->data, "id", NULL) == NULL) {
iconfig_node_clear(node); iconfig_node_clear(node);
key_configure_thaw(); key_configure_thaw();
return; return;
@ -727,8 +729,8 @@ static void read_keyboard_config(void)
if (node->key == NULL || node->value == NULL) if (node->key == NULL || node->value == NULL)
continue; continue;
id = config_node_get_str(node->value, "id", NULL); id = config_node_get_str(node, "id", NULL);
data = config_node_get_str(node->value, "data", NULL); data = config_node_get_str(node, "data", NULL);
if (id != NULL) if (id != NULL)
key_configure_create(id, node->key, data); key_configure_create(id, node->key, data);
} }