summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--doc/de/autogen/user/irc_commands.txt2
-rw-r--r--doc/en/autogen/user/irc_commands.txt2
-rw-r--r--doc/fr/autogen/user/irc_commands.txt2
-rw-r--r--doc/it/autogen/user/irc_commands.txt2
-rw-r--r--doc/ja/autogen/user/irc_commands.txt2
-rw-r--r--po/cs.po5
-rw-r--r--po/de.po5
-rw-r--r--po/es.po5
-rw-r--r--po/fr.po8
-rw-r--r--po/hu.po4
-rw-r--r--po/it.po5
-rw-r--r--po/ja.po5
-rw-r--r--po/pl.po5
-rw-r--r--po/pt_BR.po7
-rw-r--r--po/ru.po4
-rw-r--r--po/weechat.pot4
-rw-r--r--src/plugins/irc/irc-command.c75
18 files changed, 84 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c57c33f1..a8480f6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-dev, 2013-05-28
+v0.4.2-dev, 2013-05-29
This document lists all changes for each version.
@@ -20,6 +20,8 @@ Version 0.4.2 (under dev!)
"layout_window"
* core: fix line alignment when option weechat.look.buffer_time_format is set
to empty string
+* irc: fix multiple nicks in command /query (separated by commas): open one
+ buffer per nick
* xfer: fix compilation on OpenBSD (bug #39071)
Version 0.4.1 (2013-05-20)
diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt
index d88bcba88..29d9c61f4 100644
--- a/doc/de/autogen/user/irc_commands.txt
+++ b/doc/de/autogen/user/irc_commands.txt
@@ -461,7 +461,7 @@ Daemon2: Nachricht an diesen Daemon weiterleiten
[[command_irc_query]]
[command]*`query`* Eine private Nachricht an einen Nick schicken::
........................................
-/query [-server <server>] <nick> [<text>]
+/query [-server <server>] <nick>[,<nick>...] [<text>]
server: an diesen Server senden (interner Name)
nick: Nickname für privaten Chat
diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index 6ef458ba0..b59d9a03b 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -461,7 +461,7 @@ daemon2: forward message to this daemon
[[command_irc_query]]
[command]*`query`* send a private message to a nick::
........................................
-/query [-server <server>] <nick> [<text>]
+/query [-server <server>] <nick>[,<nick>...] [<text>]
server: send to this server (internal name)
nick: nick for private conversation
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index dae53eddd..974e26d65 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -461,7 +461,7 @@ démon2: faire suivre le message à ce démon
[[command_irc_query]]
[command]*`query`* envoyer un message privé à un pseudo::
........................................
-/query [-server <serveur>] <pseudo> [<texte>]
+/query [-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]
serveur: envoyer à ce serveur (nom interne)
pseudo: pseudo pour la conversation privée
diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt
index c89c893b7..90ba230d6 100644
--- a/doc/it/autogen/user/irc_commands.txt
+++ b/doc/it/autogen/user/irc_commands.txt
@@ -461,7 +461,7 @@ demone2: reindirizza messaggio a questo demone
[[command_irc_query]]
[command]*`query`* invia un messaggio privato ad un nick::
........................................
-/query [-server <server>] <nick> [<testo>]
+/query [-server <server>] <nick>[,<nick>...] [<text>]
server: invia a questo server (nome interno)
nick: nick per la conversazione privata
diff --git a/doc/ja/autogen/user/irc_commands.txt b/doc/ja/autogen/user/irc_commands.txt
index 72941edc1..780834b95 100644
--- a/doc/ja/autogen/user/irc_commands.txt
+++ b/doc/ja/autogen/user/irc_commands.txt
@@ -461,7 +461,7 @@ daemon2: メッセージをデーモンに転送
[[command_irc_query]]
[command]*`query`* ニックネーム宛にプライベートメッセージを送信::
........................................
-/query [-server <server>] <nick> [<text>]
+/query [-server <server>] <nick>[,<nick>...] [<text>]
server: 送信先サーバ (内部サーバ名)
nick: プライベート会話を行うニックネーム
diff --git a/po/cs.po b/po/cs.po
index b04250f49..55ce5c2de 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5207,7 +5207,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "poslat soukromou zprávu přezdívce"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <přezdívka> [<text>]"
msgid ""
diff --git a/po/de.po b/po/de.po
index 44f1ad5cc..e1b630f61 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -5730,7 +5730,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "Eine private Nachricht an einen Nick schicken"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick> [<text>]"
msgid ""
diff --git a/po/es.po b/po/es.po
index c97060ab0..56812147b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5416,7 +5416,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "enviar mensaje privado a un usuario"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <servidor>] <apodo> [<texto>]"
msgid ""
diff --git a/po/fr.po b/po/fr.po
index e330b5bb4..cc7d51f4a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
-"PO-Revision-Date: 2013-05-21 22:35+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
+"PO-Revision-Date: 2013-05-29 11:57+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -5581,8 +5581,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "envoyer un message privé à un pseudo"
-msgid "[-server <server>] <nick> [<text>]"
-msgstr "[-server <serveur>] <pseudo> [<texte>]"
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgstr "[-server <serveur>] <pseudo>[,<pseudo>...] [<texte>]"
msgid ""
"server: send to this server (internal name)\n"
diff --git a/po/hu.po b/po/hu.po
index 1b16b2a28..30ce69c29 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4727,7 +4727,7 @@ msgid "send a private message to a nick"
msgstr "személyes üzenet küldése egy felhasználónak"
#, fuzzy
-msgid "[-server <server>] <nick> [<text>]"
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[szerver | név]"
#, fuzzy
diff --git a/po/it.po b/po/it.po
index 771abc934..4d8794c2d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5487,7 +5487,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "invia un messaggio privato ad un nick"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick> [<testo>]"
msgid ""
diff --git a/po/ja.po b/po/ja.po
index 50ecd0677..3da104b07 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -5389,7 +5389,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "ニックネーム宛にプライベートメッセージを送信"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <server>] <nick> [<text>]"
msgid ""
diff --git a/po/pl.po b/po/pl.po
index bf88d5994..07e53e584 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:54+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5498,7 +5498,8 @@ msgstr ""
msgid "send a private message to a nick"
msgstr "wysyła prywatną wiadomość do użytkownika"
-msgid "[-server <server>] <nick> [<text>]"
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[-server <serwer>] <nick> [<tekst>]"
msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8baee9105..dc344e784 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:55+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5036,8 +5036,9 @@ msgstr ""
msgid "send a private message to a nick"
msgstr ""
-msgid "[-server <server>] <nick> [<text>]"
-msgstr ""
+#, fuzzy
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
+msgstr "<apelido> [<apelido>...]"
msgid ""
"server: send to this server (internal name)\n"
diff --git a/po/ru.po b/po/ru.po
index 2e2651bcb..20621c5ce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-05-20 16:55+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4759,7 +4759,7 @@ msgid "send a private message to a nick"
msgstr "отправить личное сообщение нику"
#, fuzzy
-msgid "[-server <server>] <nick> [<text>]"
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr "[сервер | ник]"
#, fuzzy
diff --git a/po/weechat.pot b/po/weechat.pot
index b1a1429f9..4c5b93469 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-21 22:34+0200\n"
+"POT-Creation-Date: 2013-05-29 11:55+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4191,7 +4191,7 @@ msgstr ""
msgid "send a private message to a nick"
msgstr ""
-msgid "[-server <server>] <nick> [<text>]"
+msgid "[-server <server>] <nick>[,<nick>...] [<text>]"
msgstr ""
msgid ""
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 5d2fccf84..03af690ee 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -3507,8 +3507,8 @@ int
irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
- char *string;
- int arg_nick, arg_text;
+ char *string, **nicks;
+ int i, arg_nick, arg_text, num_nicks;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
@@ -3528,37 +3528,50 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COMMAND_CHECK_SERVER("query", 1);
- /* create private window if not already opened */
- ptr_channel = irc_channel_search (ptr_server, argv[arg_nick]);
- if (!ptr_channel)
+ nicks = weechat_string_split (argv[arg_nick], ",", 0, 0, &num_nicks);
+ if (nicks)
{
- ptr_channel = irc_channel_new (ptr_server,
- IRC_CHANNEL_TYPE_PRIVATE,
- argv[arg_nick], 1, 0);
- if (!ptr_channel)
+ for (i = 0; i < num_nicks; i++)
{
- weechat_printf (ptr_server->buffer,
- _("%s%s: cannot create new private "
- "buffer \"%s\""),
- weechat_prefix ("error"), IRC_PLUGIN_NAME,
- argv[arg_nick]);
- return WEECHAT_RC_OK;
- }
- }
- weechat_buffer_set (ptr_channel->buffer, "display", "1");
+ /* create private window if not already opened */
+ ptr_channel = irc_channel_search (ptr_server, nicks[i]);
+ if (!ptr_channel)
+ {
+ ptr_channel = irc_channel_new (ptr_server,
+ IRC_CHANNEL_TYPE_PRIVATE,
+ nicks[i], 1, 0);
+ if (!ptr_channel)
+ {
+ weechat_printf (ptr_server->buffer,
+ _("%s%s: cannot create new private "
+ "buffer \"%s\""),
+ weechat_prefix ("error"), IRC_PLUGIN_NAME,
+ nicks[i]);
+ }
+ }
- /* display text if given */
- if (argv_eol[arg_text])
- {
- string = irc_color_decode (argv_eol[arg_text],
- weechat_config_boolean (irc_config_network_colors_receive));
- irc_input_user_message_display (ptr_channel->buffer, 0,
- (string) ? string : argv_eol[arg_text]);
- if (string)
- free (string);
- irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
- "PRIVMSG %s :%s",
- argv[arg_nick], argv_eol[arg_text]);
+ if (ptr_channel)
+ {
+ /* switch to buffer */
+ weechat_buffer_set (ptr_channel->buffer, "display", "1");
+
+ /* display text if given */
+ if (argv_eol[arg_text])
+ {
+ string = irc_color_decode (argv_eol[arg_text],
+ weechat_config_boolean (irc_config_network_colors_receive));
+ irc_input_user_message_display (ptr_channel->buffer, 0,
+ (string) ? string : argv_eol[arg_text]);
+ if (string)
+ free (string);
+ irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH,
+ NULL,
+ "PRIVMSG %s :%s",
+ nicks[i], argv_eol[arg_text]);
+ }
+ }
+ }
+ weechat_string_free_split (nicks);
}
}
else
@@ -5948,7 +5961,7 @@ irc_command_init ()
NULL, &irc_command_pong, NULL);
weechat_hook_command ("query",
N_("send a private message to a nick"),
- N_("[-server <server>] <nick> [<text>]"),
+ N_("[-server <server>] <nick>[,<nick>...] [<text>]"),
N_("server: send to this server (internal name)\n"
" nick: nick for private conversation\n"
" text: text to send"),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:40:46 +0000