diff options
| -rw-r--r-- | doc/en/autogen/user/irc_options.txt | 15 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_options.txt | 15 | ||||
| -rw-r--r-- | doc/it/autogen/user/irc_options.txt | 15 | ||||
| -rw-r--r-- | po/cs.po | 19 | ||||
| -rw-r--r-- | po/de.po | 19 | ||||
| -rw-r--r-- | po/es.po | 19 | ||||
| -rw-r--r-- | po/fr.po | 23 | ||||
| -rw-r--r-- | po/hu.po | 17 | ||||
| -rw-r--r-- | po/it.po | 19 | ||||
| -rw-r--r-- | po/pl.po | 19 | ||||
| -rw-r--r-- | po/ru.po | 17 | ||||
| -rw-r--r-- | po/weechat.pot | 16 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 21 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.h | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-ctcp.c | 77 |
15 files changed, 257 insertions, 57 deletions
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 73c83710e..6348a38cf 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -48,6 +48,21 @@ ** type: boolean ** values: on, off (default value: on) +* *irc.look.display_ctcp_blocked* +** description: display CTCP message even if it is blocked +** type: boolean +** values: on, off (default value: on) + +* *irc.look.display_ctcp_reply* +** description: display CTCP reply sent by WeeChat +** type: boolean +** values: on, off (default value: on) + +* *irc.look.display_ctcp_unknown* +** description: display CTCP message even if it is unknown CTCP +** type: boolean +** values: on, off (default value: on) + * *irc.look.display_nick_modes* ** description: display nick modes in "input_prompt" bar item ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index d65540084..ce163ddb6 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -48,6 +48,21 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: on) +* *irc.look.display_ctcp_blocked* +** description: afficher le message CTCP même s'il est bloqué +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.display_ctcp_reply* +** description: afficher la réponse CTCP envoyée par WeeChat +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.display_ctcp_unknown* +** description: afficher le message CTCP même si le CTCP est inconnu +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *irc.look.display_nick_modes* ** description: affiche les modes du pseudo dans l'objet de barre "input_prompt" ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 0bcc0830a..f5767da1e 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -48,6 +48,21 @@ ** tipo: bool ** valori: on, off (valore predefinito: on) +* *irc.look.display_ctcp_blocked* +** descrizione: display CTCP message even if it is blocked +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.display_ctcp_reply* +** descrizione: display CTCP reply sent by WeeChat +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.display_ctcp_unknown* +** descrizione: display CTCP message even if it is unknown CTCP +** tipo: bool +** valori: on, off (valore predefinito: on) + * *irc.look.display_nick_modes* ** descrizione: visualizza le modalità nick nell'elemento barra "input_prompt" ** tipo: bool @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-03 15:15+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4079,6 +4079,15 @@ msgstr "zobrazit zprávu, když označen/odznačen jako nepřítomen" msgid "display channel modes in \"buffer_name\" bar item" msgstr "zobrazit módy kanálu v položce pole \"buffer_name\"" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\"" @@ -4206,10 +4215,14 @@ msgstr "" msgid "send unknown commands to server" msgstr "posílat neznámé příkazy na server" -#, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +#, fuzzy, c-format +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%sCTCP požadavek od %s%s%s: %s%s%s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "(zakázáno)" + #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "%sCTCP odpověď od %s%s%s: %s%s%s %ld.%ld %s" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-08 22:29+0100\n" "Last-Translator: Nils G <weechatter@arcor.de>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4253,6 +4253,15 @@ msgstr "Bei Abwesenheit und Rückkehr eine Nachricht anzeigen" msgid "display channel modes in \"buffer_name\" bar item" msgstr "Zeige die Channel-Modi mittels \"buffer_name\" in der Bar-Item an" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "Zeige Nick-Modi in \"input_prompt\" Bar-Item" @@ -4391,10 +4400,14 @@ msgstr "" msgid "send unknown commands to server" msgstr "Sende unbekannte Befehle an den Server" -#, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +#, fuzzy, c-format +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%sCTCP angefordert von %s%s%s: %s%s%s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "(deaktiviert)" + #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "%sCTCP Antwort von %s%s%s: %s%s%s %ld.%ld %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-03 15:16+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4142,6 +4142,15 @@ msgstr "mostrar mensaje cuando se cambie el estado de ausente" msgid "display channel modes in \"buffer_name\" bar item" msgstr "mostrar los modos del canal en el elemento de barra \"buffer_name\"" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\"" @@ -4278,10 +4287,14 @@ msgstr "" msgid "send unknown commands to server" msgstr "envía comandos desconocidos al servidor" -#, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +#, fuzzy, c-format +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%sCTCP solicitado por %s%s%s: %s%s%s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "(desactivado)" + #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "%srespuesta CTCP de %s%s%s: %s%s%s %ld.%ld %s" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" -"PO-Revision-Date: 2010-01-08 22:38+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" +"PO-Revision-Date: 2010-01-14 10:21+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -4191,6 +4191,15 @@ msgstr "affiche un message pour l'absence/le retour" msgid "display channel modes in \"buffer_name\" bar item" msgstr "affiche les modes du canal dans l'objet de barre \"buffer_name\"" +msgid "display CTCP message even if it is blocked" +msgstr "afficher le message CTCP même s'il est bloqué" + +msgid "display CTCP reply sent by WeeChat" +msgstr "afficher la réponse CTCP envoyée par WeeChat" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "afficher le message CTCP même si le CTCP est inconnu" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\"" @@ -4328,8 +4337,11 @@ msgid "send unknown commands to server" msgstr "envoie les commandes inconnues au serveur" #, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" -msgstr "%sCTCP demandé par %s%s%s: %s%s%s%s%s" +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" +msgstr "%sCTCP demandé par %s%s%s: %s%s%s%s%s%s" + +msgid " (blocked)" +msgstr " (bloqué)" #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" @@ -6061,3 +6073,6 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" + +#~ msgid "display message if CTCP is unknown" +#~ msgstr "afficher le message si le CTCP est inconnu" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-03 15:16+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4025,6 +4025,15 @@ msgstr "üzenet mutatása távollétkor/visszatéréskor" msgid "display channel modes in \"buffer_name\" bar item" msgstr "" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" @@ -4148,9 +4157,13 @@ msgid "send unknown commands to server" msgstr "ismeretlen parancsok küldése az IRC szervernek" #, fuzzy, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%s%s%s eltávolította %s%s%s-t a szerverről" +#, fuzzy +msgid " (blocked)" +msgstr "a felhasználók le lettek tiltva" + #, fuzzy, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "CTCP %sPING%s válasz %s%s%s felhasználótól: %ld.%ld másodperc\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.31-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-09 23:03+0100\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4163,6 +4163,15 @@ msgstr "visualizza messaggio al cambio dello stato di assenza" msgid "display channel modes in \"buffer_name\" bar item" msgstr "visualizza le modalità canale nell'elemento barra \"buffer_name\"" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\"" @@ -4299,10 +4308,14 @@ msgstr "" msgid "send unknown commands to server" msgstr "invia comandi sconosciuti al server" -#, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +#, fuzzy, c-format +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%sCTCP richiesto da %s%s%s: %s%s%s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "(disabilitato)" + #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "%sRisposta CTCP da %s%s%s: %s%s%s %ld,%ld %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-03 15:16+0100\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: Polish\n" @@ -4124,6 +4124,15 @@ msgstr "wyświetla wiadomość, kiedy stajemy sie/przestajemy być nieobecni" msgid "display channel modes in \"buffer_name\" bar item" msgstr "wyświetl atrybuty kanału w elemencie paska \"buffer_name\"" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\" " @@ -4256,10 +4265,14 @@ msgstr "" msgid "send unknown commands to server" msgstr "wysyłaj nieznane komendy do serwera" -#, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +#, fuzzy, c-format +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%sCTCP zażądane przez %s%s%s: %s%s%s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "(wyłączone)" + #, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "%sOdpowiedź CTCP od %s%s%s: %s%s%s %ld.%ld %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: 2010-01-03 15:16+0100\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4026,6 +4026,15 @@ msgstr "показывать сообщение во все каналы при msgid "display channel modes in \"buffer_name\" bar item" msgstr "" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" @@ -4149,9 +4158,13 @@ msgid "send unknown commands to server" msgstr "отсылать неизвестные команды IRC серверу" #, fuzzy, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" msgstr "%s%s%s убил %s%s%s" +#, fuzzy +msgid " (blocked)" +msgstr "команда users отключена" + #, fuzzy, c-format msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" msgstr "Ответ на %sPING%s от %s%s%s: %ld.%ld секунд\n" diff --git a/po/weechat.pot b/po/weechat.pot index f48cd792e..5ef530e54 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-01-08 22:27+0100\n" +"POT-Creation-Date: 2010-01-14 10:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3422,6 +3422,15 @@ msgstr "" msgid "display channel modes in \"buffer_name\" bar item" msgstr "" +msgid "display CTCP message even if it is blocked" +msgstr "" + +msgid "display CTCP reply sent by WeeChat" +msgstr "" + +msgid "display CTCP message even if it is unknown CTCP" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" @@ -3526,7 +3535,10 @@ msgid "send unknown commands to server" msgstr "" #, c-format -msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s" +msgid "%sCTCP requested by %s%s%s: %s%s%s%s%s%s" +msgstr "" + +msgid " (blocked)" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 33d49a8a7..d411ce447 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -56,6 +56,9 @@ struct t_config_option *irc_config_look_nick_suffix; struct t_config_option *irc_config_look_nick_completion_smart; struct t_config_option *irc_config_look_display_away; struct t_config_option *irc_config_look_display_channel_modes; +struct t_config_option *irc_config_look_display_ctcp_blocked; +struct t_config_option *irc_config_look_display_ctcp_reply; +struct t_config_option *irc_config_look_display_ctcp_unknown; struct t_config_option *irc_config_look_display_nick_modes; struct t_config_option *irc_config_look_display_old_topic; struct t_config_option *irc_config_look_hide_nickserv_pwd; @@ -1360,6 +1363,24 @@ irc_config_init () N_("display channel modes in \"buffer_name\" bar item"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, &irc_config_change_look_display_channel_modes, NULL, NULL, NULL); + irc_config_look_display_ctcp_blocked = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_ctcp_blocked", "boolean", + N_("display CTCP message even if it is blocked"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_look_display_ctcp_reply = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_ctcp_reply", "boolean", + N_("display CTCP reply sent by WeeChat"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_look_display_ctcp_unknown = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_ctcp_unknown", "boolean", + N_("display CTCP message even if it is unknown CTCP"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_display_nick_modes = weechat_config_new_option ( irc_config_file, ptr_section, "display_nick_modes", "boolean", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 7a761f016..18900b1bc 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -78,6 +78,9 @@ extern struct t_config_option *irc_config_look_nick_suffix; extern struct t_config_option *irc_config_look_nick_completion_smart; extern struct t_config_option *irc_config_look_display_away; extern struct t_config_option *irc_config_look_display_channel_modes; +extern struct t_config_option *irc_config_look_display_ctcp_blocked; +extern struct t_config_option *irc_config_look_display_ctcp_reply; +extern struct t_config_option *irc_config_look_display_ctcp_unknown; extern struct t_config_option *irc_config_look_display_nick_modes; extern struct t_config_option *irc_config_look_display_old_topic; extern struct t_config_option *irc_config_look_hide_nickserv_pwd; diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index 2ad11f114..a2aeaff15 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -108,20 +108,27 @@ irc_ctcp_display_request (struct t_irc_server *server, const char *command, struct t_irc_channel *channel, const char *nick, const char *ctcp, - const char *arguments) + const char *arguments, + const char *reply) { + /* CTCP blocked and user doesn't want to see message? then just return */ + if (reply && !reply[0] + && !weechat_config_boolean (irc_config_look_display_ctcp_blocked)) + return; + weechat_printf_tags ((channel) ? channel->buffer : server->buffer, irc_protocol_tags (command, "irc_ctcp"), - _("%sCTCP requested by %s%s%s: %s%s%s%s%s"), + _("%sCTCP requested by %s%s%s: %s%s%s%s%s%s"), weechat_prefix ("network"), IRC_COLOR_CHAT_NICK, nick, IRC_COLOR_CHAT, IRC_COLOR_CHAT_CHANNEL, ctcp, - (arguments) ? IRC_COLOR_CHAT : "", + IRC_COLOR_CHAT, (arguments) ? " " : "", - (arguments) ? arguments : ""); + (arguments) ? arguments : "", + (reply && !reply[0]) ? _(" (blocked)") : ""); } /* @@ -243,19 +250,22 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server, nick, ctcp, (arguments) ? " " : "", (arguments) ? arguments : ""); - - weechat_printf_tags ((channel) ? channel->buffer : server->buffer, - irc_protocol_tags (command, "irc_ctcp,irc_ctcp_reply"), - _("%sCTCP reply to %s%s%s: %s%s%s%s%s"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_NICK, - nick, - IRC_COLOR_CHAT, - IRC_COLOR_CHAT_CHANNEL, - ctcp, - (arguments) ? IRC_COLOR_CHAT : "", - (arguments) ? " " : "", - (arguments) ? arguments : ""); + + if (weechat_config_boolean (irc_config_look_display_ctcp_reply)) + { + weechat_printf_tags ((channel) ? channel->buffer : server->buffer, + irc_protocol_tags (command, "irc_ctcp,irc_ctcp_reply"), + _("%sCTCP reply to %s%s%s: %s%s%s%s%s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_NICK, + nick, + IRC_COLOR_CHAT, + IRC_COLOR_CHAT_CHANNEL, + ctcp, + (arguments) ? IRC_COLOR_CHAT : "", + (arguments) ? " " : "", + (arguments) ? arguments : ""); + } } /* @@ -899,7 +909,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, { reply = irc_ctcp_get_reply (server, arguments + 1); irc_ctcp_display_request (server, command, channel, nick, - arguments + 1, pos_args); + arguments + 1, pos_args, reply); if (!reply || reply[0]) { irc_ctcp_reply_to_nick (server, command, channel, nick, @@ -918,7 +928,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, if (reply) { irc_ctcp_display_request (server, command, channel, nick, - arguments + 1, pos_args); + arguments + 1, pos_args, reply); if (reply[0]) { @@ -933,19 +943,22 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, } else { - weechat_printf_tags ((channel) ? channel->buffer : server->buffer, - irc_protocol_tags (command, "irc_ctcp"), - _("%sUnknown CTCP requested by %s%s%s: " - "%s%s%s%s%s"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_NICK, - nick, - IRC_COLOR_CHAT, - IRC_COLOR_CHAT_CHANNEL, - arguments + 1, - (pos_args) ? IRC_COLOR_CHAT : "", - (pos_args) ? " " : "", - (pos_args) ? pos_args : ""); + if (weechat_config_boolean (irc_config_look_display_ctcp_unknown)) + { + weechat_printf_tags ((channel) ? channel->buffer : server->buffer, + irc_protocol_tags (command, "irc_ctcp"), + _("%sUnknown CTCP requested by %s%s%s: " + "%s%s%s%s%s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_NICK, + nick, + IRC_COLOR_CHAT, + IRC_COLOR_CHAT_CHANNEL, + arguments + 1, + (pos_args) ? IRC_COLOR_CHAT : "", + (pos_args) ? " " : "", + (pos_args) ? pos_args : ""); + } } } |