diff options
| author | Jilles Tjoelker <jilles@irssi.org> | 2007-11-17 16:35:47 +0000 |
|---|---|---|
| committer | jilles <jilles@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2007-11-17 16:35:47 +0000 |
| commit | 18f2a0fc67326311bf8e6abb73c9bf524565336d (patch) | |
| tree | c334beae04fee1e98e95e3c9b4e61675def95c4a /src | |
| parent | 5bf14bbbe58f4889f71da94e4f53eb9e6032c05e (diff) | |
| download | irssi-18f2a0fc67326311bf8e6abb73c9bf524565336d.zip | |
Do not allow /ping by itself to ctcp ping a channel.
This is like the new /ver behaviour.
Bug #542, patch by Geert with tweaks by exg
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4640 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/irc/fe-irc-commands.c | 2 | ||||
| -rw-r--r-- | src/irc/core/irc-commands.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 9172c677..37f8b9ab 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -298,7 +298,7 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server, cmd_params_free(free_arg); } -/* SYNTAX: VER [<target>] */ +/* SYNTAX: VER [<nick> | <channel> | *] */ static void cmd_ver(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) { char *str; diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index 7f31b59d..7255ad7e 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -504,7 +504,7 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server) cmd_params_free(free_arg); } -/* SYNTAX: PING <nicks> */ +/* SYNTAX: PING [<nick> | <channel> | *] */ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) { GTimeVal tv; @@ -512,10 +512,9 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item CMD_IRC_SERVER(server); - if (*data == '\0' || strcmp(data, "*") == 0) { - if (!IS_IRC_ITEM(item)) - cmd_return_error(CMDERR_NOT_JOINED); - + if (*data == '\0') { + if (!IS_QUERY(item)) + cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); data = window_item_get_target(item); } |