summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--doc/de/autogen/user/irc_options.txt2
-rw-r--r--doc/en/autogen/user/irc_options.txt2
-rw-r--r--doc/fr/autogen/user/irc_options.txt2
-rw-r--r--doc/it/autogen/user/irc_options.txt2
-rw-r--r--doc/ja/autogen/user/irc_options.txt2
-rw-r--r--doc/pl/autogen/user/irc_options.txt2
-rw-r--r--src/plugins/irc/irc-config.c2
8 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c87cdb13..d93e61275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* aspell: fix detection of nicks with non-alphanumeric chars
* guile: disable guile gmp allocator (fix crash on unload of relay plugin)
(bug #40628)
+* irc: do not display names by default when joining a channel (task #13045)
* irc: add server option "ssl_fingerprint" (task #12724)
* irc: display PONG answer when resulting from manual /ping command
* irc: fix time parsed in tag of messages on Cygwin
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index dfb9a1785..9facf40be 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** Beschreibung: `durch Kommata getrennte Liste von Nachrichten die beim betreten eines Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = Topic, 333 = Nick/Datum für Topic, 366 = genutzte Namen im Channel`
** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333,366"`)
+** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** Beschreibung: `Zeige das alte Thema an, falls das Thema des Channels geändert wurde`
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 68d7e6e00..2a849e22b 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names on channel`
** type: string
-** values: any string (default value: `"329,332,333,366"`)
+** values: any string (default value: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** description: `display old topic when channel topic is changed`
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 4bdf2c60a..78540077f 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** description: `liste de messages (séparés par des virgules) à afficher après avoir rejoint un canal: 329 = date de création du canal, 332 = titre, 333 = pseudo/date pour le titre, 366 = noms sur le canal`
** type: chaîne
-** valeurs: toute chaîne (valeur par défaut: `"329,332,333,366"`)
+** valeurs: toute chaîne (valeur par défaut: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** description: `afficher l'ancien titre lorsque le titre du canal est changé`
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index cb5bf4c34..ae014d851 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** descrizione: `elenco separato da virgole di messaggi da mostrare dopo l'ingresso in un canale: 329 = data di creazione del canale, 332 = argomento, 333 = nick/data per l'argomento, 366 = nomi sul canale`
** tipo: stringa
-** valori: qualsiasi stringa (valore predefinito: `"329,332,333,366"`)
+** valori: qualsiasi stringa (valore predefinito: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** descrizione: `visualizza l'argomento del canale precedente quando viene cambiato`
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index e4e575b86..1c70643d5 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** 説明: `チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャンネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、366 = チャンネル参加者リスト`
** タイプ: 文字列
-** 値: 未制約文字列 (デフォルト値: `"329,332,333,366"`)
+** 値: 未制約文字列 (デフォルト値: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** 説明: `チャンネルトピックが変更された場合に、古いトピックを表示`
diff --git a/doc/pl/autogen/user/irc_options.txt b/doc/pl/autogen/user/irc_options.txt
index c66317274..bcf927147 100644
--- a/doc/pl/autogen/user/irc_options.txt
+++ b/doc/pl/autogen/user/irc_options.txt
@@ -136,7 +136,7 @@
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** opis: `oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: 329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 366 = osoby na kanale`
** typ: ciąg
-** wartości: dowolny ciąg (domyślna wartość: `"329,332,333,366"`)
+** wartości: dowolny ciąg (domyślna wartość: `"329,332,333"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** opis: `wyświetl stary temat, kiedy zmieniany jest temat kanału`
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index c703a4b50..ebeb09d12 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2315,7 +2315,7 @@ irc_config_init ()
N_("comma-separated list of messages to display after joining a channel: "
"329 = channel creation date, 332 = topic, 333 = nick/date for topic, "
"366 = names on channel"),
- NULL, 0, 0, "329,332,333,366", NULL, 0, NULL, NULL,
+ NULL, 0, 0, "329,332,333", NULL, 0, NULL, NULL,
&irc_config_change_look_display_join_message, NULL, NULL, NULL);
irc_config_look_display_old_topic = weechat_config_new_option (
irc_config_file, ptr_section,