diff options
Diffstat (limited to 'src/core/channels-setup.c')
| -rw-r--r-- | src/core/channels-setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index 6867568d..b56ffb6e 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -50,6 +50,8 @@ 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); @@ -106,7 +108,7 @@ static void channels_setup_destroy_rec(CHANNEL_SETUP_REC *channel) signal_emit("channel setup destroyed", 1, channel); g_free(channel->name); - g_free(channel->chatnet); + g_free_not_null(channel->chatnet); g_free_not_null(channel->password); g_free_not_null(channel->botmasks); g_free_not_null(channel->autosendcmd); |