diff options
| author | LemonBoy <thatlemon@gmail.com> | 2017-02-14 22:04:35 +0100 |
|---|---|---|
| committer | LemonBoy <thatlemon@gmail.com> | 2017-02-14 23:02:05 +0100 |
| commit | c067f8e99b9332ca485bf1e1809b745878c80f4a (patch) | |
| tree | ee664287306fd427d20b8d82ceae05b69015562c | |
| parent | 653c7fb05a67841acd4fcc12ce1fee3be9955453 (diff) | |
| download | irssi-c067f8e99b9332ca485bf1e1809b745878c80f4a.zip | |
Do not alias /server <hostname> to /server connect <hostname>
Closes #559.
| -rw-r--r-- | docs/help/in/server.in | 2 | ||||
| -rw-r--r-- | src/core/chat-commands.c | 19 |
2 files changed, 6 insertions, 15 deletions
diff --git a/docs/help/in/server.in b/docs/help/in/server.in index 44de0efc..2e757260 100644 --- a/docs/help/in/server.in +++ b/docs/help/in/server.in @@ -59,8 +59,6 @@ %9Examples:%9 /SERVER - /SERVER chat.freenode.net - /SERVER +chat.freenode.net /SERVER CONNECT chat.freenode.net /SERVER CONNECT +chat.freenode.net /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index c737b810..69c2fc91 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -250,19 +250,14 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item) command_runsub("server", data, server, item); } -static void sig_default_command_server(const char *data, SERVER_REC *server, - WI_ITEM_REC *item) -{ - signal_emit("command server connect", 3, data, server, item); -} - -/* SYNTAX: SERVER [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>] - [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>] - [-ssl_ciphers <list>] - [-!] [-noautosendcmd] +/* SYNTAX: SERVER CONNECT [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] + [-ssl_pass <password>] [-ssl_verify] [-ssl_cafile <cafile>] + [-ssl_capath <capath>] + [-ssl_ciphers <list>] + [-!] [-noautosendcmd] [-noproxy] [-network <network>] [-host <hostname>] [-rawlog <file>] - [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ + [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */ /* NOTE: -network replaces the old -ircnet flag. */ static void cmd_server_connect(const char *data, SERVER_REC *server) { @@ -495,7 +490,6 @@ void chat_commands_init(void) command_bind("foreach channel", NULL, (SIGNAL_FUNC) cmd_foreach_channel); command_bind("foreach query", NULL, (SIGNAL_FUNC) cmd_foreach_query); - signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server); signal_add("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg); command_set_options("connect", "4 6 !! -network ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_pinned_cert +ssl_pinned_pubkey tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey +host noproxy -rawlog noautosendcmd"); @@ -515,6 +509,5 @@ void chat_commands_deinit(void) command_unbind("foreach channel", (SIGNAL_FUNC) cmd_foreach_channel); command_unbind("foreach query", (SIGNAL_FUNC) cmd_foreach_query); - signal_remove("default command server", (SIGNAL_FUNC) sig_default_command_server); signal_remove("server sendmsg", (SIGNAL_FUNC) sig_server_sendmsg); } |