Comments are now allowed everywhere in config files.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2374 dbcabf3a-b0e7-0310-adc4-f8d773084564

5 files changed, 14 insertions, 9 deletions

diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 399465ed..b36cb0f7 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -360,11 +360,11 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
 
 	/* get list of aliases from mainconfig */
 	node = iconfig_node_traverse("aliases", FALSE);
-	tmp = node == NULL ? NULL : node->value;
+	tmp = node == NULL ? NULL : config_node_first(node->value);
 
 	len = strlen(alias);
 	complist = NULL;
-	for (; tmp != NULL; tmp = tmp->next) {
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		CONFIG_NODE *node = tmp->data;
 
 		if (node->type != NODE_TYPE_KEY)
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index bb4405fa..382a09f7 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -173,12 +173,12 @@ static void show_aliases(const char *alias)
 	printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_ALIASLIST_HEADER);
 
 	node = iconfig_node_traverse("aliases", FALSE);
-	tmp = node == NULL ? NULL : node->value;
+	tmp = node == NULL ? NULL : config_node_first(node->value);
 
 	/* first get the list of aliases sorted */
 	list = NULL;
 	aliaslen = strlen(alias);
-	for (; tmp != NULL; tmp = tmp->next) {
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		CONFIG_NODE *node = tmp->data;
 
 		if (node->type != NODE_TYPE_KEY)
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 7fa970bb..0bdda55f 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -399,7 +399,8 @@ static void read_hilight_config(void)
 		return;
 	}
 
-	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
+	tmp = config_node_first(node->value);
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		node = tmp->data;
 
 		if (node->type != NODE_TYPE_BLOCK)
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index b3619bba..ac682001 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -114,7 +114,8 @@ static CONFIG_NODE *key_config_find(const char *key)
 	/* remove old keyboard settings */
 	node = iconfig_node_traverse("(keyboard", TRUE);
 
-	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
+	tmp = config_node_first(node->value);
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		node = tmp->data;
 
 		if (strcmp(config_node_get_str(node, "key", ""), key) == 0)
@@ -794,7 +795,8 @@ static void read_keyboard_config(void)
 		return;
 	}
 
-	for (tmp = node->value; tmp != NULL; tmp = tmp->next)
+	tmp = config_node_first(node->value);
+	for (; tmp != NULL; tmp = config_node_next(tmp))
 		key_config_read(tmp->data);
 
         key_configure_thaw();
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 9615006e..56ebcb89 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -81,7 +81,8 @@ static void window_add_items(WINDOW_REC *window, CONFIG_NODE *node)
 	if (node == NULL)
 		return;
 
-	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
+	tmp = config_node_first(node->value);
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		CONFIG_NODE *node = tmp->data;
 
 		type = config_node_get_str(node, "type", NULL);
@@ -106,7 +107,8 @@ static void sig_layout_restore(void)
 	node = iconfig_node_traverse("windows", FALSE);
 	if (node == NULL) return;
 
-	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
+	tmp = config_node_first(node->value);
+	for (; tmp != NULL; tmp = config_node_next(tmp)) {
 		CONFIG_NODE *node = tmp->data;
 
 		window = window_find_refnum(atoi(node->key));