Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / core / channels-setup.c

diff --git a/apps/irssi/src/core/channels-setup.c b/apps/irssi/src/core/channels-setup.c
index a53bd3f31798496b83653c9811089b27326fcc48..a61ccb5625889aa943f4202b7eb0e1bf53f24ef9 100644 (file)
--- a/apps/irssi/src/core/channels-setup.c
+++ b/apps/irssi/src/core/channels-setup.c
@@ -38,7 +38,7 @@ static void channel_setup_save(CHANNEL_SETUP_REC *channel)
        index = g_slist_index(setupchannels, channel);
 
        parentnode = iconfig_node_traverse("(channels", TRUE);
-       node = config_node_index(parentnode, index);
+       node = config_node_nth(parentnode, index);
        if (node == NULL)
                node = config_node_section(parentnode, NULL, NODE_TYPE_BLOCK);
 
@@ -54,6 +54,8 @@ static void channel_setup_save(CHANNEL_SETUP_REC *channel)
 
 void channel_setup_create(CHANNEL_SETUP_REC *channel)
 {
+       channel->type = module_get_uniq_id("CHANNEL SETUP", 0);
+
        if (g_slist_find(setupchannels, channel) == NULL)
                setupchannels = g_slist_append(setupchannels, channel);
        channel_setup_save(channel);
@@ -118,13 +120,6 @@ static CHANNEL_SETUP_REC *channel_setup_read(CONFIG_NODE *node)
 
        channel = config_node_get_str(node, "name", NULL);
         chatnet = config_node_get_str(node, "chatnet", NULL);
-       if (chatnet == NULL) /* FIXME: remove this after .98... */ {
-               chatnet = g_strdup(config_node_get_str(node, "ircnet", NULL));
-               if (chatnet != NULL) {
-                        iconfig_node_set_str(node, "chatnet", chatnet);
-                        iconfig_node_set_str(node, "ircnet", NULL);
-               }
-       }
 
        chatnetrec = chatnet == NULL ? NULL : chatnet_find(chatnet);
        if (channel == NULL || chatnetrec == NULL) {
@@ -158,7 +153,8 @@ static void channels_read_config(void)
        /* Read channels */
        node = iconfig_node_traverse("channels", FALSE);
        if (node != NULL) {
-               for (tmp = node->value; tmp != NULL; tmp = tmp->next)
+               tmp = config_node_first(node->value);
+               for (; tmp != NULL; tmp = config_node_next(tmp))
                        channel_setup_read(tmp->data);
        }
 }