From f285fdafa04b2b48fdeb257e58dcd43faa831d74 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 28 Jan 2014 18:31:03 +0100 Subject: [PATCH] irc: add value "353" in option irc.look.display_join_message So now the values mean: - 353: names on channel - 366: names count (before this commit it meant 353 + 366) --- NEWS | 15 +++++++++++++++ doc/de/autogen/user/irc_options.txt | 4 ++-- doc/en/autogen/user/irc_options.txt | 4 ++-- doc/fr/autogen/user/irc_options.txt | 4 ++-- doc/it/autogen/user/irc_options.txt | 4 ++-- doc/ja/autogen/user/irc_options.txt | 4 ++-- doc/pl/autogen/user/irc_options.txt | 4 ++-- po/cs.po | 6 +++--- po/de.po | 7 ++++--- po/es.po | 6 +++--- po/fr.po | 10 +++++----- po/hu.po | 6 +++--- po/it.po | 7 ++++--- po/ja.po | 7 ++++--- po/pl.po | 7 ++++--- po/pt_BR.po | 6 +++--- po/ru.po | 6 +++--- po/tr.po | 6 +++--- po/weechat.pot | 6 +++--- src/plugins/irc/irc-channel.h | 4 ++-- src/plugins/irc/irc-config.c | 4 ++-- src/plugins/irc/irc-protocol.c | 17 ++++++++++++----- 22 files changed, 85 insertions(+), 59 deletions(-) diff --git a/NEWS b/NEWS index c95c16de9..d85ad904e 100644 --- a/NEWS +++ b/NEWS @@ -67,6 +67,21 @@ The default value for status bar items becomes: /set weechat.bar.status.items "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,[lag],[hotlist],completion,scroll" ---- +=== IRC messages on channel join + +The names are not displayed any more by default on channel join (they are in +nicklist anyway). + +Names can be displayed with the value "353" in option +'irc.look.display_join_message' (which is not in default value). + +The value "366" shows only names count on channel. + +If you want to display all messages on join (including names), you can do: + +---- +/set /set irc.look.display_join_message "329,332,333,353,366" +---- + === Maximum lag in IRC Option 'irc.network.lag_max' has been added. diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index c02897109..fdc3d622d 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** Werte: on, off (Standardwert: `on`) * [[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` +** Beschreibung: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** Typ: Zeichenkette -** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333"`) +** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333,366"`) * [[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 e9d5d6e8a..28c232d9e 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** values: on, off (default value: `on`) * [[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` +** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** type: string -** values: any string (default value: `"329,332,333"`) +** values: any string (default value: `"329,332,333,366"`) * [[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 3ea966cf8..d18b5af52 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** valeurs: on, off (valeur par défaut: `on`) * [[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` +** 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, 353 = noms sur le canal, 366 = décompte des noms` ** type: chaîne -** valeurs: toute chaîne (valeur par défaut: `"329,332,333"`) +** valeurs: toute chaîne (valeur par défaut: `"329,332,333,366"`) * [[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 8079d3e5a..5abf9bf46 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** valori: on, off (valore predefinito: `on`) * [[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` +** descrizione: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** tipo: stringa -** valori: qualsiasi stringa (valore predefinito: `"329,332,333"`) +** valori: qualsiasi stringa (valore predefinito: `"329,332,333,366"`) * [[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 b6dbff6cd..5bffc986b 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** 値: on, off (デフォルト値: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** 説明: `チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャンネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、366 = チャンネル参加者リスト` +** 説明: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** タイプ: 文字列 -** 値: 未制約文字列 (デフォルト値: `"329,332,333"`) +** 値: 未制約文字列 (デフォルト値: `"329,332,333,366"`) * [[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 12eacc8bb..7f183e200 100644 --- a/doc/pl/autogen/user/irc_options.txt +++ b/doc/pl/autogen/user/irc_options.txt @@ -134,9 +134,9 @@ ** wartości: on, off (domyślna wartość: `on`) * [[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` +** opis: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** typ: ciąg -** wartości: dowolny ciąg (domyślna wartość: `"329,332,333"`) +** wartości: dowolny ciąg (domyślna wartość: `"329,332,333,366"`) * [[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/po/cs.po b/po/cs.po index 0e5000560..716f8454e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:20+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -6402,8 +6402,8 @@ msgstr "zobrazovat hosta ve zprávách o odchodu/ukončení" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/de.po b/po/de.po index 76309a5d1..a05a3f847 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-26 10:04+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-25 19:44+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -7219,10 +7219,11 @@ msgstr "Zeigt den Host in join Nachrichten des lokalen Client an" msgid "display host in part/quit messages" msgstr "Zeigt den Host in einer part/quit Nachricht an" +#, fuzzy msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" "durch Kommata getrennte Liste von Nachrichten die beim betreten eines " "Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = " diff --git a/po/es.po b/po/es.po index 2d4b1fd39..66222b30c 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:21+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -6643,8 +6643,8 @@ msgstr "muestra el host en mensajes de salida/abandono" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/fr.po b/po/fr.po index b05380abb..7e67a3b76 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" -"PO-Revision-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" +"PO-Revision-Date: 2014-01-28 18:25+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -7040,12 +7040,12 @@ msgstr "afficher le nom d'hôte dans les messages part/quit" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" "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" +"pour le titre, 353 = noms sur le canal, 366 = décompte des noms" msgid "display old topic when channel topic is changed" msgstr "afficher l'ancien titre lorsque le titre du canal est changé" diff --git a/po/hu.po b/po/hu.po index 93e95a999..9152a0833 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-06 10:16+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5935,8 +5935,8 @@ msgstr "alapértelmezett kilépő üzenet" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/it.po b/po/it.po index ddd72b7b0..39e25f1e0 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:22+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -6775,10 +6775,11 @@ msgstr "visualizza l'host nei messaggi di entrata dal client locale" msgid "display host in part/quit messages" msgstr "visualizza host nei messaggi di uscita/abbandono" +#, fuzzy msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" "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 " diff --git a/po/ja.po b/po/ja.po index e10eac15d..bcf74920c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:22+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6745,10 +6745,11 @@ msgstr "ローカルクライアントからの参加メッセージにホスト msgid "display host in part/quit messages" msgstr "退出/終了 メッセージにホスト名を表示" +#, fuzzy msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" "チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャン" "ネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、" diff --git a/po/pl.po b/po/pl.po index 22e1879a9..877c571b0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:23+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6887,10 +6887,11 @@ msgstr "wyświetlaj host podczas wchodzenia na kanał" msgid "display host in part/quit messages" msgstr "pokazuj host w wiadomościach o opuszczeniu kanału/wyjściu z IRC" +#, fuzzy msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" "oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: " "329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 366 = osoby na " diff --git a/po/pt_BR.po b/po/pt_BR.po index 1893d7aa8..27aad8a77 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-18 21:23+0100\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -6157,8 +6157,8 @@ msgstr "" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/ru.po b/po/ru.po index 40b3e59da..ef7244e6f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-06 10:17+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5959,8 +5959,8 @@ msgstr "сообщение о выходе по-умолчанию" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/tr.po b/po/tr.po index 43e09e168..746cc3e6d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2014-01-06 10:17+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5254,8 +5254,8 @@ msgstr "" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/weechat.pot b/po/weechat.pot index dba92aa32..c6da78ed3 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: 2014-01-25 13:36+0100\n" +"POT-Creation-Date: 2014-01-28 18:24+0100\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -5210,8 +5210,8 @@ msgstr "" msgid "" "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" +"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " +"on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h index 870c34bd5..f9957d195 100644 --- a/src/plugins/irc/irc-channel.h +++ b/src/plugins/irc/irc-channel.h @@ -48,8 +48,8 @@ struct t_irc_channel int limit; /* user limit (0 is limit not set) */ char *key; /* channel key (NULL if no key set) */ struct t_hashtable *join_msg_received; /* messages received after join: */ - /* 366=names, 332/333=topic, */ - /* 329=creation date */ + /* 353=names, 366=names count, */ + /* 332/333=topic, 329=creation date */ int checking_away; /* = 1 if checking away with WHO cmd */ char *away_message; /* to display away only once in pv */ int has_quit_server; /* =1 if nick has quit (pv only), to */ diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index ef923ef67..8779262fa 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -2314,8 +2314,8 @@ irc_config_init () "display_join_message", "string", 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", NULL, 0, NULL, NULL, + "353 = names on channel, 366 = names count"), + NULL, 0, 0, "329,332,333,366", 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, diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 4283f58ee..0603b9dbf 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -4074,10 +4074,10 @@ IRC_PROTOCOL_CALLBACK(366) ptr_channel = irc_channel_search (server, argv[3]); if (ptr_channel && ptr_channel->nicks) { - if (weechat_hashtable_has_key (ptr_channel->join_msg_received, command) - || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, command)) + /* display users on channel */ + if (weechat_hashtable_has_key (ptr_channel->join_msg_received, "353") + || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "353")) { - /* display users on channel */ infolist = weechat_infolist_get ("nicklist", ptr_channel->buffer, NULL); if (infolist) { @@ -4165,8 +4165,12 @@ IRC_PROTOCOL_CALLBACK(366) } weechat_infolist_free (infolist); } + } - /* display number of nicks, ops, halfops & voices on the channel */ + /* display number of nicks, ops, halfops & voices on the channel */ + if (weechat_hashtable_has_key (ptr_channel->join_msg_received, "366") + || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "366")) + { irc_nick_count (server, ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice, &num_normal); str_nicks_count[0] = '\0'; @@ -4257,7 +4261,10 @@ IRC_PROTOCOL_CALLBACK(366) } if (ptr_channel) - weechat_hashtable_set (ptr_channel->join_msg_received, command, "1"); + { + weechat_hashtable_set (ptr_channel->join_msg_received, "353", "1"); + weechat_hashtable_set (ptr_channel->join_msg_received, "366", "1"); + } weechat_bar_item_update ("input_prompt");