summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-01-19 23:21:24 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-01-19 23:21:24 +0000
commitc20cc9bb1f43c44485f37cbb64e4857c3b678d55 (patch)
tree722f484204baf016caf54843f36c72d9abbaff6d /src/core
parent77c658bf80eb279e383f2ec113fef5797f04facc (diff)
downloadirssi-c20cc9bb1f43c44485f37cbb64e4857c3b678d55.zip
Added -noproxy option to /CONNECT and /SERVER.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2322 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
-rw-r--r--src/core/chat-commands.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 12768f9b..9b033779 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -84,7 +84,10 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr)
conn->family = AF_INET;
if (g_hash_table_lookup(optlist, "!") != NULL)
- conn->no_autojoin_channels = TRUE;
+ conn->no_autojoin_channels = TRUE;
+
+ if (g_hash_table_lookup(optlist, "noproxy") != NULL)
+ g_free_and_null(conn->proxy);
host = g_hash_table_lookup(optlist, "host");
if (host != NULL && *host != '\0') {
@@ -397,7 +400,7 @@ void chat_commands_init(void)
signal_add("default command server", (SIGNAL_FUNC) sig_default_command_server);
- command_set_options("connect", "4 6 !! +host");
+ command_set_options("connect", "4 6 !! +host noproxy");
command_set_options("join", "invite");
}