summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@0x90.dk>2014-06-15 22:15:25 +0200
committerAlexander Færøy <ahf@0x90.dk>2014-06-15 22:15:25 +0200
commit1545e01447d2234b9e352c75f0a4b28300e560d0 (patch)
tree12e5a1cf379d2d951ae537ea7f29858ad6148084
parent279db87d3201ba10c229ad703a96e50b55aadc65 (diff)
parentc40c54d782851c2a0827e750646e40be11424bbc (diff)
downloadirssi-1545e01447d2234b9e352c75f0a4b28300e560d0.zip
Merge pull request #36 from dajohi/g_tree_foreach
Replace deprecated g_tree_traverse with g_tree_foreach.
-rw-r--r--src/fe-common/core/keyboard.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index 67a8d09b..00454401 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -374,8 +374,8 @@ static void key_states_rescan(void)
memset(used_keys, 0, sizeof(used_keys));
- g_tree_traverse(key_states, (GTraverseFunc) key_state_destroy,
- G_IN_ORDER, NULL);
+ g_tree_foreach(key_states, (GTraverseFunc) key_state_destroy,
+ NULL);
g_tree_destroy(key_states);
key_states = g_tree_new((GCompareFunc) strcmp);
@@ -884,8 +884,8 @@ void keyboard_deinit(void)
g_hash_table_destroy(keys);
g_hash_table_destroy(default_keys);
- g_tree_traverse(key_states, (GTraverseFunc) key_state_destroy,
- G_IN_ORDER, NULL);
+ g_tree_foreach(key_states, (GTraverseFunc) key_state_destroy,
+ NULL);
g_tree_destroy(key_states);
signal_remove("irssi init read settings", (SIGNAL_FUNC) read_keyboard_config);