diff options
| author | dequis <dx@dxzone.com.ar> | 2015-06-14 10:42:41 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-06-14 10:42:41 -0300 |
| commit | 29fb0d98023de26e643b213177ecb9fbb73d83f8 (patch) | |
| tree | 5e5c8245f0df764984d63da705988620aeb3c3b5 /src/lib-config/parse.c | |
| parent | 7beffbdcc5d9ca7433f6617a652ed0b2feca3677 (diff) | |
| parent | 6fcafc599350737d0d14f3c863af594efc391124 (diff) | |
| download | irssi-29fb0d98023de26e643b213177ecb9fbb73d83f8.zip | |
Merge branch 'master' into irssiproxy
Conflicts:
src/irc/proxy/listen.c
Diffstat (limited to 'src/lib-config/parse.c')
| -rw-r--r-- | src/lib-config/parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c index 1b20195a..c106fc46 100644 --- a/src/lib-config/parse.c +++ b/src/lib-config/parse.c @@ -173,7 +173,7 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) if (key == NULL && node->type != NODE_TYPE_LIST) return G_TOKEN_ERROR; - newnode = config_node_section(node, key, NODE_TYPE_BLOCK); + newnode = config_node_section(rec, node, key, NODE_TYPE_BLOCK); config_parse_loop(rec, newnode, (GTokenType) '}'); g_free_not_null(key); @@ -188,7 +188,7 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) /* list */ if (key == NULL) return G_TOKEN_ERROR; - newnode = config_node_section(node, key, NODE_TYPE_LIST); + newnode = config_node_section(rec, node, key, NODE_TYPE_LIST); config_parse_loop(rec, newnode, (GTokenType) ')'); g_free_not_null(key); |