mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
backwards compatibility for s/ircnet/chanet/ change.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@673 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
d564fd2b32
commit
64e0b8d96b
@ -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);
|
||||
|
@ -313,6 +313,8 @@ 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) {
|
||||
|
Loading…
Reference in New Issue
Block a user