aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

/RELOAD broke keyboard bindings

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@475 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-16 16:35:37 +00:00 committed by cras
parent 6f111a7987
commit e8ed53bd92
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,18 @@ 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);
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)
{ {
@ -190,13 +202,7 @@ void key_configure_remove(const char *key)
if (rec == NULL) return; if (rec == NULL) return;
keyconfig_clear(rec->info->id, key); keyconfig_clear(rec->info->id, key);
key_configure_destroy(rec);
rec->info->keys = g_slist_remove(rec->info->keys, rec);
g_hash_table_remove(keys, key);
g_free_not_null(rec->data);
g_free(rec->key);
g_free(rec);
} }
int key_pressed(const char *key, void *data) int key_pressed(const char *key, void *data)
@ -232,14 +238,14 @@ void read_keyinfo(KEYINFO_REC *info, CONFIG_NODE *node)
/* remove all old keys */ /* remove all old keys */
while (info->keys != NULL) while (info->keys != NULL)
key_configure_remove(((KEY_REC *) info->keys->data)->key); key_configure_destroy(info->keys->data);
/* add the new keys */ /* add the new keys */
for (tmp = node->value; tmp != NULL; tmp = tmp->next) { for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
node = tmp->data; node = tmp->data;
if (node->key != NULL) if (node->key != NULL)
key_configure_add(info->id, node->value, node->key); key_configure_add(info->id, node->key, node->value);
} }
} }