diff options
| author | Timo Sirainen <cras@irssi.org> | 2004-07-11 21:31:49 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2004-07-11 21:31:49 +0000 |
| commit | ab3ba54ab438b2487fb5dfe169ef21975855974c (patch) | |
| tree | f404ad2216a0a16f5fe1daea862bf254a90f77b4 /src/core | |
| parent | d9cc888daa56423c8630898df0e0d003337de066 (diff) | |
| download | irssi-ab3ba54ab438b2487fb5dfe169ef21975855974c.zip | |
s/ircnet/network/ - patch by Joost Vunderink
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3270 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/chat-commands.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index 0036fec8..a764373c 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -67,6 +67,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, /* connect to server */ chatnet = proto == NULL ? NULL : g_hash_table_lookup(optlist, proto->chatnet); + + if (chatnet == NULL) + chatnet = g_hash_table_lookup(optlist, "network"); + conn = server_create_conn(proto != NULL ? proto->id : -1, addr, atoi(portstr), chatnet, password, nick); if (proto == NULL) @@ -129,9 +133,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, /* SYNTAX: CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] - [-noproxy] [-ircnet <ircnet>] [-host <hostname>] + [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] <address>|<chatnet> [<port> [<password> [<nick>]]] */ +/* NOTE: -network replaces the old -ircnet flag. */ static void cmd_connect(const char *data) { SERVER_CONNECT_REC *conn; @@ -233,9 +238,10 @@ static void sig_default_command_server(const char *data, SERVER_REC *server, /* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] - [-noproxy] [-ircnet <ircnet>] [-host <hostname>] + [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ +/* NOTE: -network replaces the old -ircnet flag. */ static void cmd_server_connect(const char *data, SERVER_REC *server) { SERVER_CONNECT_REC *conn; |