/CONNECT -ircnet didn't load ircnet specific settings correctly

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1363 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-03-08 00:24:27 +00:00 committed by cras
commit 57493acd39
3 changed files with 23 additions and 20 deletions

View file

@ -63,8 +63,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr)
proto = chat_protocol_find_net(optlist);
/* connect to server */
conn = server_create_conn(proto != NULL ? proto->id : -1,
addr, atoi(portstr), password, nick);
chatnet = proto == NULL ? NULL :
g_hash_table_lookup(optlist, proto->chatnet);
conn = server_create_conn(proto != NULL ? proto->id : -1, addr,
atoi(portstr), chatnet, password, nick);
if (proto == NULL)
proto = chat_protocol_find_id(conn->chat_type);
@ -81,12 +83,6 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr)
else if (g_hash_table_lookup(optlist, "4") != NULL)
conn->family = AF_INET;
chatnet = g_hash_table_lookup(optlist, proto->chatnet);
if (chatnet != NULL) {
g_free_not_null(conn->chatnet);
conn->chatnet = g_strdup(chatnet);
}
host = g_hash_table_lookup(optlist, "host");
if (host != NULL && *host != '\0') {
IPADDR ip4, ip6;