summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2008-06-07 21:48:32 +0000
committerSven Wegener <swegener@gentoo.org>2008-06-07 21:48:32 +0000
commit5e0c7c655200b174badbb878d81d9539e256df98 (patch)
tree67047a1e74d03e746cf006c26217d8bf99902233 /net-irc/irssi/files
parentStable for HPPA (bug #221063). (diff)
downloadgentoo-2-5e0c7c655200b174badbb878d81d9539e256df98.tar.gz
gentoo-2-5e0c7c655200b174badbb878d81d9539e256df98.tar.bz2
gentoo-2-5e0c7c655200b174badbb878d81d9539e256df98.zip
Another patch to fix bug #202561.
(Portage version: 2.1.5.4)
Diffstat (limited to 'net-irc/irssi/files')
-rw-r--r--net-irc/irssi/files/irssi-0.8.12-svn-4640.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/net-irc/irssi/files/irssi-0.8.12-svn-4640.patch b/net-irc/irssi/files/irssi-0.8.12-svn-4640.patch
new file mode 100644
index 000000000000..0fff52a5a1f4
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.12-svn-4640.patch
@@ -0,0 +1,82 @@
+r4640 | jilles | 2007-11-17 16:35:47 +0000 (Sat, 17 Nov 2007) | 4 lines
+
+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
+
+Index: trunk/src/fe-common/irc/fe-irc-commands.c
+===================================================================
+--- trunk/src/fe-common/irc/fe-irc-commands.c (revision 4639)
++++ trunk/src/fe-common/irc/fe-irc-commands.c (revision 4640)
+@@ -298,7 +298,7 @@
+ 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;
+Index: trunk/src/irc/core/irc-commands.c
+===================================================================
+--- trunk/src/irc/core/irc-commands.c (revision 4639)
++++ trunk/src/irc/core/irc-commands.c (revision 4640)
+@@ -504,7 +504,7 @@
+ 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 @@
+
+ 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);
+ }
+
+Index: trunk/docs/help/in/ping.in
+===================================================================
+--- trunk/docs/help/in/ping.in (revision 4639)
++++ trunk/docs/help/in/ping.in (revision 4640)
+@@ -1,10 +1,10 @@
+
+ @SYNTAX:ping@
+
+-Sends CTCP PING to another IRC client. This is used
+-to find out the speed of IRC network. When the PING
+-reply comes in, irssi shows the interval time between
+-sending the request and receiving the reply.
++Sends CTCP PING to another IRC client or to an IRC channel.
++This is used to find out the speed of IRC network. When
++the PING reply comes in, irssi shows the interval time
++between sending the request and receiving the reply.
+
+ See also: CTCP
+
+Index: trunk/docs/help/in/ver.in
+===================================================================
+--- trunk/docs/help/in/ver.in (revision 4639)
++++ trunk/docs/help/in/ver.in (revision 4640)
+@@ -1,9 +1,9 @@
+
+ @SYNTAX:ver@
+
+-Sends a CTCP VERSION request to the nick. This is used
+-to find out which client and/or script the nick
+-is using.
++Sends a CTCP VERSION request to a nick or channel.
++This is used to find out which client and/or
++script the nick is using.
+
+ See also: CTCP
+