From cf0c2a7fb68fea991d128ddc5cd7ac667a40b1a4 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 17 Dec 2000 07:40:59 +0000 Subject: [PATCH] removed backwards compatibility from ircnet -> chatnet change git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1006 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/channels-setup.c | 2 -- src/core/servers-setup.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index 5a445114..4cef0e0c 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -50,8 +50,6 @@ static CHANNEL_SETUP_REC *channel_setup_read(CONFIG_NODE *node) rec->autojoin = config_node_get_bool(node, "autojoin", FALSE); rec->name = g_strdup(channel); rec->chatnet = g_strdup(config_node_get_str(node, "chatnet", NULL)); - if (rec->chatnet == NULL) /* FIXME: remove this in time... */ - rec->chatnet = g_strdup(config_node_get_str(node, "ircnet", NULL)); rec->password = (password == NULL || *password == '\0') ? NULL : g_strdup(password); rec->botmasks = (botmasks == NULL || *botmasks == '\0') ? NULL : g_strdup(botmasks); rec->autosendcmd = (autosendcmd == NULL || *autosendcmd == '\0') ? NULL : g_strdup(autosendcmd); diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 8a657f8d..59883694 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -314,8 +314,6 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node) rec = NULL; chatnet = config_node_get_str(node, "chatnet", NULL); - if (chatnet == NULL) /* FIXME: remove this in time... */ - chatnet = config_node_get_str(node, "ircnet", NULL); signal_emit("server setup read", 3, &rec, node, chatnet == NULL ? NULL : chatnet_find(chatnet)); if (rec == NULL) {