config changes, CONFIG_REC is now required parameter for

config_node_set_int/bool() and config_node_add_list()


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

5 files changed, 11 insertions, 8 deletions

diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index b56ffb6e..5a445114 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -77,7 +77,7 @@ static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 	iconfig_node_set_str(node, "name", channel->name);
 	iconfig_node_set_str(node, "chatnet", channel->chatnet);
 	if (channel->autojoin)
-		config_node_set_bool(node, "autojoin", TRUE);
+		iconfig_node_set_bool(node, "autojoin", TRUE);
 	iconfig_node_set_str(node, "password", channel->password);
 	iconfig_node_set_str(node, "botmasks", channel->botmasks);
 	iconfig_node_set_str(node, "autosendcmd", channel->autosendcmd);
diff --git a/src/core/ignore.c b/src/core/ignore.c
index 420e91c7..6d432a4c 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -220,13 +220,13 @@ static void ignore_set_config(IGNORE_REC *rec)
 		g_free(levelstr);
 	}
 	iconfig_node_set_str(node, "pattern", rec->pattern);
-	if (rec->regexp) config_node_set_bool(node, "regexp", TRUE);
-	if (rec->fullword) config_node_set_bool(node, "fullword", TRUE);
-	if (rec->replies) config_node_set_bool(node, "replies", TRUE);
+	if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
+	if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
+	if (rec->replies) iconfig_node_set_bool(node, "replies", TRUE);
 
 	if (rec->channels != NULL && *rec->channels != NULL) {
 		node = config_node_section(node, "channels", NODE_TYPE_LIST);
-		config_node_add_list(node, rec->channels);
+		iconfig_node_add_list(node, rec->channels);
 	}
 }
 
diff --git a/src/core/log.c b/src/core/log.c
index 112e46b6..c9598ba2 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -319,7 +319,7 @@ static void log_update_config(LOG_REC *log)
 	node = config_node_section(node, log->fname, NODE_TYPE_BLOCK);
 
 	if (log->autoopen)
-		config_node_set_bool(node, "auto_open", TRUE);
+		iconfig_node_set_bool(node, "auto_open", TRUE);
 	else
 		iconfig_node_set_str(node, "auto_open", NULL);
 
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 6a53f183..8a657f8d 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -351,12 +351,12 @@ static void server_setup_save(SERVER_SETUP_REC *rec)
 	iconfig_node_set_str(node, "address", rec->address);
 	iconfig_node_set_str(node, "chatnet", rec->chatnet);
 
-	config_node_set_int(node, "port", rec->port);
+	iconfig_node_set_int(node, "port", rec->port);
 	iconfig_node_set_str(node, "password", rec->password);
 	iconfig_node_set_str(node, "own_host", rec->own_host);
 
 	if (rec->autoconnect)
-		config_node_set_bool(node, "autoconnect", TRUE);
+		iconfig_node_set_bool(node, "autoconnect", TRUE);
 
 	signal_emit("server setup saved", 2, rec, node);
 }
diff --git a/src/core/settings.h b/src/core/settings.h
index b399846d..e56daefc 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -30,9 +30,12 @@ typedef struct {
 
 #define iconfig_node_traverse(a, b) config_node_traverse(mainconfig, a, b)
 #define iconfig_node_set_str(a, b, c) config_node_set_str(mainconfig, a, b, c)
+#define iconfig_node_set_int(a, b, c) config_node_set_int(mainconfig, a, b, c)
+#define iconfig_node_set_bool(a, b, c) config_node_set_bool(mainconfig, a, b, c)
 #define iconfig_node_list_remove(a, b) config_node_list_remove(mainconfig, a, b)
 #define iconfig_node_remove(a, b) config_node_remove(mainconfig, a, b)
 #define iconfig_node_clear(a) config_node_clear(mainconfig, a)
+#define iconfig_node_add_list(a, b) config_node_add_list(mainconfig, a, b)
 
 extern CONFIG_REC *mainconfig;