diff --git a/ChangeLog b/ChangeLog index 8c3b01eaa..1302674ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.2-dev, 2010-02-05 +v0.3.2-dev, 2010-02-06 Version 0.3.2 (under dev!) @@ -20,8 +20,9 @@ Version 0.3.2 (under dev!) (bug #28741) * irc: fix PART message received on Undernet server (bug #28825) * irc: add options irc.look.smart_filter_join and irc.look.smart_filter_quit -* irc: add option irc.look.display_channel_modes_hide_key to hide channel key +* irc: add option irc.look.item_channel_modes_hide_key to hide channel key in channel modes (bug #23961) +* irc: add option irc.look.item_nick_prefix * irc: add command /map * irc: fix compilation with old GnuTLS versions (bug #28723) * logger: allow date format in logger options path and mask (task #9430) diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index f40a919cc..5dcfdcc7f 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -43,16 +43,6 @@ ** type: integer ** values: off, local, channel (default value: local) -* *irc.look.display_channel_modes* -** description: display channel modes in "buffer_name" bar item -** type: boolean -** values: on, off (default value: on) - -* *irc.look.display_channel_modes_hide_key* -** description: hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel) -** type: boolean -** values: on, off (default value: off) - * *irc.look.display_ctcp_blocked* ** description: display CTCP message even if it is blocked ** type: boolean @@ -68,11 +58,6 @@ ** type: boolean ** values: on, off (default value: on) -* *irc.look.display_nick_modes* -** description: display nick modes in "input_prompt" bar item -** type: boolean -** values: on, off (default value: on) - * *irc.look.display_old_topic* ** description: display old topic when channel topic is changed ** type: boolean @@ -88,11 +73,31 @@ ** type: string ** values: any string (default value: "irc_privmsg,irc_notice") +* *irc.look.item_channel_modes* +** description: display channel modes in "buffer_name" bar item +** type: boolean +** values: on, off (default value: on) + +* *irc.look.item_channel_modes_hide_key* +** description: hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel) +** type: boolean +** values: on, off (default value: off) + * *irc.look.item_display_server* ** description: name of bar item where IRC server is displayed (for status bar) ** type: integer ** values: buffer_plugin, buffer_name (default value: buffer_plugin) +* *irc.look.item_nick_modes* +** description: display nick modes in "input_prompt" bar item +** type: boolean +** values: on, off (default value: on) + +* *irc.look.item_nick_prefix* +** description: display nick prefix in "input_prompt" bar item +** type: boolean +** values: on, off (default value: on) + * *irc.look.msgbuffer_fallback* ** description: default target buffer for msgbuffer options when target is private and that private buffer is not found ** type: integer diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 1c6b8164e..fb65aa7cf 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -43,16 +43,6 @@ ** type: entier ** valeurs: off, local, channel (valeur par défaut: local) -* *irc.look.display_channel_modes* -** description: affiche les modes du canal dans l'objet de barre "buffer_name" -** type: booléen -** valeurs: on, off (valeur par défaut: on) - -* *irc.look.display_channel_modes_hide_key* -** description: cacher la clé du canal si les modes sont affichés dans l'objet de barre "buffer_name" (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal) -** type: booléen -** valeurs: on, off (valeur par défaut: off) - * *irc.look.display_ctcp_blocked* ** description: afficher le message CTCP même s'il est bloqué ** type: booléen @@ -68,11 +58,6 @@ ** 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 -** valeurs: on, off (valeur par défaut: on) - * *irc.look.display_old_topic* ** description: afficher l'ancien titre lorsque le titre du canal est changé ** type: booléen @@ -88,11 +73,31 @@ ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: "irc_privmsg,irc_notice") +* *irc.look.item_channel_modes* +** description: affiche les modes du canal dans l'objet de barre "buffer_name" +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.item_channel_modes_hide_key* +** description: cacher la clé du canal si les modes sont affichés dans l'objet de barre "buffer_name" (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal) +** type: booléen +** valeurs: on, off (valeur par défaut: off) + * *irc.look.item_display_server* ** description: nom de l'objet de barre où est affiché le serveur IRC (pour la barre de statut) ** type: entier ** valeurs: buffer_plugin, buffer_name (valeur par défaut: buffer_plugin) +* *irc.look.item_nick_modes* +** description: affiche les modes du pseudo dans l'objet de barre "input_prompt" +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.item_nick_prefix* +** description: affiche le préfixe du pseudo dans l'objet de barre "input_prompt" +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *irc.look.msgbuffer_fallback* ** description: tampon cible par défaut pour les options msgbuffer quand la cible est "private" et que le tampon privé n'est pas trouvé ** type: entier diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 767b945ed..22e0547a2 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -43,16 +43,6 @@ ** tipo: intero ** valori: off, local, channel (valore predefinito: local) -* *irc.look.display_channel_modes* -** descrizione: visualizza le modalità canale nell'elemento barra "buffer_name" -** tipo: bool -** valori: on, off (valore predefinito: on) - -* *irc.look.display_channel_modes_hide_key* -** descrizione: hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel) -** tipo: bool -** valori: on, off (valore predefinito: off) - * *irc.look.display_ctcp_blocked* ** descrizione: visualizza messaggio CTCP anche se bloccato ** tipo: bool @@ -68,11 +58,6 @@ ** 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 -** valori: on, off (valore predefinito: on) - * *irc.look.display_old_topic* ** descrizione: visualizza l'argomento del canale precedente quando viene cambiato ** tipo: bool @@ -88,11 +73,31 @@ ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: "irc_privmsg,irc_notice") +* *irc.look.item_channel_modes* +** descrizione: visualizza le modalità canale nell'elemento barra "buffer_name" +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.item_channel_modes_hide_key* +** descrizione: hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel) +** tipo: bool +** valori: on, off (valore predefinito: off) + * *irc.look.item_display_server* ** descrizione: nome dell'elemento barra dov'è visualizzato il server IRC (per la barra di stato) ** tipo: intero ** valori: buffer_plugin, buffer_name (valore predefinito: buffer_plugin) +* *irc.look.item_nick_modes* +** descrizione: visualizza le modalità nick nell'elemento barra "input_prompt" +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.item_nick_prefix* +** descrizione: display nick prefix in "input_prompt" bar item +** tipo: bool +** valori: on, off (valore predefinito: on) + * *irc.look.msgbuffer_fallback* ** descrizione: buffer di destinazione predefinito per le opzioni di msgbuffer quando la destinazione è privata ed il buffer privato non viene trovato ** tipo: intero diff --git a/po/cs.po b/po/cs.po index bd2d809fc..e497c2ea5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:56+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4080,14 +4080,6 @@ msgstr "chytré doplňování přezdívek (doplňovat posledně mluvící jako p msgid "display message when (un)marking as away" 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 "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "" @@ -4097,11 +4089,23 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +msgid "display old topic when channel topic is changed" +msgstr "zobrazit staré téma rozhovoru, když se téma změní" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "zobrazit módy kanálu v položce pole \"buffer_name\"" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\"" -msgid "display old topic when channel topic is changed" -msgstr "zobrazit staré téma rozhovoru, když se téma změní" +#, fuzzy +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\"" msgid "hide password displayed by nickserv" msgstr "schovat heslo zobrazené nickservem" diff --git a/po/de.po b/po/de.po index 52c43bd52..c1f739e7f 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-26 22:35+0100\n" "Last-Translator: Nils G \n" "Language-Team: weechat-dev \n" @@ -4257,14 +4257,6 @@ msgstr "" msgid "display message when (un)marking as away" 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 "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "CTCP Nachrichten werden angezeigt, obwohl sie unterdrückt werden" @@ -4274,11 +4266,23 @@ msgstr "CTCP Antworten, die durch WeeChat versendet wurden, werden angezeigt" msgid "display CTCP message even if it is unknown CTCP" msgstr "unbekannte CTCP Nachrichten werden angezeigt." +msgid "display old topic when channel topic is changed" +msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "Zeige die Channel-Modi mittels \"buffer_name\" in der Bar-Item an" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "Zeige Nick-Modi in \"input_prompt\" Bar-Item" -msgid "display old topic when channel topic is changed" -msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde" +#, fuzzy +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "Zeige Nick-Modi in \"input_prompt\" Bar-Item" msgid "hide password displayed by nickserv" msgstr "Von NickServ angezeigte Passwörter verstecken" diff --git a/po/es.po b/po/es.po index aea51f61f..3d02717af 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:56+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -4166,14 +4166,6 @@ msgstr "" msgid "display message when (un)marking as away" 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 "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "mostrar mensaje CTCP incluso si está bloqueado" @@ -4183,11 +4175,23 @@ msgstr "mostrar respuesta CTCP enviada por WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "mostrar mensaje CTCP incluso si es un CTCP desconocido" +msgid "display old topic when channel topic is changed" +msgstr "mostrar el tema anterior cuando se cambia el tema del canal" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "mostrar los modos del canal en el elemento de barra \"buffer_name\"" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\"" -msgid "display old topic when channel topic is changed" -msgstr "mostrar el tema anterior cuando se cambia el tema del canal" +#, fuzzy +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\"" msgid "hide password displayed by nickserv" msgstr "ocultar contraseña mostrada por nickserv" diff --git a/po/fr.po b/po/fr.po index aa6d4bfd1..df32e9f8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" -"PO-Revision-Date: 2010-02-02 15:35+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" +"PO-Revision-Date: 2010-02-06 12:11+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -4193,6 +4193,18 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "affiche un message pour l'absence/le retour" +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 old topic when channel topic is changed" +msgstr "afficher l'ancien titre lorsque le titre du canal est changé" + msgid "display channel modes in \"buffer_name\" bar item" msgstr "affiche les modes du canal dans l'objet de barre \"buffer_name\"" @@ -4204,20 +4216,11 @@ msgstr "" "\"buffer_name\" (cela cachera tous les paramètres des modes du canal si le " "mode +k est défini sur le canal)" -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\"" -msgid "display old topic when channel topic is changed" -msgstr "afficher l'ancien titre lorsque le titre du canal est changé" +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "affiche le préfixe du pseudo dans l'objet de barre \"input_prompt\"" msgid "hide password displayed by nickserv" msgstr "masquer le mot de passe affiché par nickserv" diff --git a/po/hu.po b/po/hu.po index 56f5fdc5d..9956cf93b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:57+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4026,14 +4026,6 @@ msgstr "okos névkiegészítés (először az utolsó partnerre egészít ki)" msgid "display message when (un)marking as away" msgstr "üzenet mutatása távollétkor/visszatéréskor" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - -msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "" @@ -4043,10 +4035,21 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +msgid "display old topic when channel topic is changed" +msgstr "" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" -msgid "display old topic when channel topic is changed" +msgid "display nick prefix in \"input_prompt\" bar item" msgstr "" msgid "hide password displayed by nickserv" diff --git a/po/it.po b/po/it.po index 102818708..320362e6f 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:57+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -4165,14 +4165,6 @@ msgstr "" msgid "display message when (un)marking as away" 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 "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "visualizza messaggio CTCP anche se bloccato" @@ -4182,11 +4174,23 @@ msgstr "visualizza risposta CTCP inviata da WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "visualizza messaggio CTCP anche se è CTCP sconosciuto" +msgid "display old topic when channel topic is changed" +msgstr "visualizza l'argomento del canale precedente quando viene cambiato" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "visualizza le modalità canale nell'elemento barra \"buffer_name\"" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\"" -msgid "display old topic when channel topic is changed" -msgstr "visualizza l'argomento del canale precedente quando viene cambiato" +#, fuzzy +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\"" msgid "hide password displayed by nickserv" msgstr "nascondi password visualizzata da nickserv" diff --git a/po/pl.po b/po/pl.po index 3f303a3c2..2b39e40cb 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:57+0100\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: Polish\n" @@ -4148,14 +4148,6 @@ msgstr "" msgid "display message when (un)marking as away" 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 "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "wyświetl wiadomość CTCP nawet jeśli jest blokowana" @@ -4165,11 +4157,23 @@ msgstr "wyświetlaj odpowiedź CTCP wysłaną przez WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "wyświetl wiadomość CTCP nawet jeśli jest to nieznana CTCP" +msgid "display old topic when channel topic is changed" +msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "wyświetl atrybuty kanału w elemencie paska \"buffer_name\"" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\" " -msgid "display old topic when channel topic is changed" -msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału" +#, fuzzy +msgid "display nick prefix in \"input_prompt\" bar item" +msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\" " msgid "hide password displayed by nickserv" msgstr "ukryj hasło wyświetlane przez nickserv" diff --git a/po/ru.po b/po/ru.po index ad0998a45..f803a7ab5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: 2010-01-23 11:57+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4027,14 +4027,6 @@ msgstr "умное дополнение ников (начинает переб msgid "display message when (un)marking as away" msgstr "показывать сообщение во все каналы при установке/снятии отсутствия" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - -msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "" @@ -4044,10 +4036,21 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +msgid "display old topic when channel topic is changed" +msgstr "" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" -msgid "display old topic when channel topic is changed" +msgid "display nick prefix in \"input_prompt\" bar item" msgstr "" msgid "hide password displayed by nickserv" diff --git a/po/weechat.pot b/po/weechat.pot index eaed9e8ae..e5f3cb51d 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-02-02 15:34+0100\n" +"POT-Creation-Date: 2010-02-06 12:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3423,14 +3423,6 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "" -msgid "display channel modes in \"buffer_name\" bar item" -msgstr "" - -msgid "" -"hide channel key if modes are displayed in \"buffer_name\" bar item (this " -"will hide all channel modes arguments if mode +k is set on channel)" -msgstr "" - msgid "display CTCP message even if it is blocked" msgstr "" @@ -3440,10 +3432,21 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +msgid "display old topic when channel topic is changed" +msgstr "" + +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + +msgid "" +"hide channel key if modes are displayed in \"buffer_name\" bar item (this " +"will hide all channel modes arguments if mode +k is set on channel)" +msgstr "" + msgid "display nick modes in \"input_prompt\" bar item" msgstr "" -msgid "display old topic when channel topic is changed" +msgid "display nick prefix in \"input_prompt\" bar item" msgstr "" msgid "hide password displayed by nickserv" diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c index be807b490..285e45693 100644 --- a/src/plugins/irc/irc-bar-item.c +++ b/src/plugins/irc/irc-bar-item.c @@ -30,6 +30,7 @@ #include "irc-config.h" #include "irc-server.h" #include "irc-channel.h" +#include "irc-nick.h" /* @@ -226,12 +227,12 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item, (part_from_channel) ? IRC_COLOR_BAR_DELIM : "", (part_from_channel) ? ")" : ""); if (!part_from_channel - && weechat_config_boolean (irc_config_look_display_channel_modes) + && weechat_config_boolean (irc_config_look_item_channel_modes) && channel->modes && channel->modes[0] && (strcmp (channel->modes, "+") != 0)) { modes_without_args = NULL; - if (weechat_config_boolean (irc_config_look_display_channel_modes_hide_key)) + if (weechat_config_boolean (irc_config_look_item_channel_modes_hide_key)) { pos_space = strchr(channel->modes, ' '); if (pos_space) @@ -400,8 +401,10 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item, { struct t_gui_buffer *buffer; struct t_irc_server *server; - char *buf; - int length; + struct t_irc_channel *channel; + struct t_irc_nick *ptr_nick; + char *buf, prefix[2], str_prefix_color[64], str_prefix[64]; + int length, prefix_color; /* make C compiler happy */ (void) data; @@ -414,20 +417,45 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item, if (buffer) { - irc_buffer_get_server_channel (buffer, &server, NULL); + irc_buffer_get_server_channel (buffer, &server, &channel); if (!server || !server->nick) return NULL; - length = strlen (server->nick) + 64 + + /* build prefix */ + str_prefix[0] = '\0'; + if (channel) + { + ptr_nick = irc_nick_search (channel, server->nick); + if (ptr_nick) + { + prefix[0] = '\0'; + prefix[1] = '\0'; + irc_nick_get_gui_infos (ptr_nick, &prefix[0], &prefix_color, + NULL, NULL); + if (prefix[0] != ' ') + { + snprintf (str_prefix_color, sizeof (str_prefix_color), + "weechat.color.nicklist_prefix%d", + prefix_color); + snprintf (str_prefix, sizeof (str_prefix), "%s%s", + weechat_color(weechat_config_string(weechat_config_get(str_prefix_color))), + prefix); + } + } + } + + /* build bar item */ + length = 64 + strlen (server->nick) + 64 + ((server->nick_modes) ? strlen (server->nick_modes) : 0) + 64 + 1; buf = malloc (length); if (buf) { - if (weechat_config_boolean (irc_config_look_display_nick_modes) + if (weechat_config_boolean (irc_config_look_item_nick_modes) && server->nick_modes && server->nick_modes[0]) { - snprintf (buf, length, "%s%s%s(%s%s%s)", + snprintf (buf, length, "%s%s%s%s(%s%s%s)", + str_prefix, IRC_COLOR_INPUT_NICK, server->nick, IRC_COLOR_BAR_DELIM, @@ -437,7 +465,8 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item, } else { - snprintf (buf, length, "%s%s", + snprintf (buf, length, "%s%s%s", + str_prefix, IRC_COLOR_INPUT_NICK, server->nick); } diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index 6acadd536..cbd8bc4e4 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -337,7 +337,8 @@ irc_channel_is_channel (const char *string) */ void -irc_channel_remove_away (struct t_irc_channel *channel) +irc_channel_remove_away (struct t_irc_server *server, + struct t_irc_channel *channel) { struct t_irc_nick *ptr_nick; @@ -345,7 +346,7 @@ irc_channel_remove_away (struct t_irc_channel *channel) { for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) { - irc_nick_set (channel, ptr_nick, 0, IRC_NICK_AWAY); + irc_nick_set (server, channel, ptr_nick, 0, IRC_NICK_AWAY); } } } @@ -369,7 +370,7 @@ irc_channel_check_away (struct t_irc_server *server, "WHO %s", channel->name); } else - irc_channel_remove_away (channel); + irc_channel_remove_away (server, channel); } } @@ -378,7 +379,8 @@ irc_channel_check_away (struct t_irc_server *server, */ void -irc_channel_set_away (struct t_irc_channel *channel, const char *nick_name, +irc_channel_set_away (struct t_irc_server *server, + struct t_irc_channel *channel, const char *nick_name, int is_away) { struct t_irc_nick *ptr_nick; @@ -387,7 +389,7 @@ irc_channel_set_away (struct t_irc_channel *channel, const char *nick_name, { ptr_nick = irc_nick_search (channel, nick_name); if (ptr_nick) - irc_nick_set_away (channel, ptr_nick, is_away); + irc_nick_set_away (server, channel, ptr_nick, is_away); } } diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h index 3e179fdaa..38d5bb933 100644 --- a/src/plugins/irc/irc-channel.h +++ b/src/plugins/irc/irc-channel.h @@ -85,10 +85,12 @@ extern void irc_channel_free_all (struct t_irc_server *server); extern struct t_irc_channel *irc_channel_search (struct t_irc_server *server, const char *channel_name); extern int irc_channel_is_channel (const char *string); -extern void irc_channel_remove_away (struct t_irc_channel *channel); +extern void irc_channel_remove_away (struct t_irc_server *server, + struct t_irc_channel *channel); extern void irc_channel_check_away (struct t_irc_server *server, struct t_irc_channel *channel, int force); -extern void irc_channel_set_away (struct t_irc_channel *channel, +extern void irc_channel_set_away (struct t_irc_server *server, + struct t_irc_channel *channel, const char *nick_name, int is_away); extern void irc_channel_nick_speaking_add (struct t_irc_channel *channel, diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 50dcc552b..ef35b67fc 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -55,13 +55,14 @@ struct t_config_option *irc_config_look_nick_prefix; 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_channel_modes_hide_key; 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_item_channel_modes; +struct t_config_option *irc_config_look_item_channel_modes_hide_key; +struct t_config_option *irc_config_look_item_nick_modes; +struct t_config_option *irc_config_look_item_nick_prefix; struct t_config_option *irc_config_look_hide_nickserv_pwd; struct t_config_option *irc_config_look_highlight_tags; struct t_config_option *irc_config_look_item_display_server; @@ -216,53 +217,68 @@ irc_config_change_look_server_buffer (void *data, } /* - * irc_config_change_look_display_channel_modes: called when the "display - * channel modes" option is - * changed + * irc_config_change_look_item_channel_modes: called when the "display + * channel modes" option is changed */ void -irc_config_change_look_display_channel_modes (void *data, - struct t_config_option *option) -{ - /* make C compiler happy */ - (void) data; - (void) option; - - weechat_bar_item_update ("buffer_name"); -} - -/* - * irc_config_change_look_display_channel_modes_hide_key: called when the - * "display channel modes - * hide key" option is - * changed - */ - -void -irc_config_change_look_display_channel_modes_hide_key (void *data, - struct t_config_option *option) -{ - /* make C compiler happy */ - (void) data; - (void) option; - - weechat_bar_item_update ("buffer_name"); -} - -/* - * irc_config_change_look_display_nick_modes: called when the "display - * nick modes" option is changed - */ - -void -irc_config_change_look_display_nick_modes (void *data, +irc_config_change_look_item_channel_modes (void *data, struct t_config_option *option) { /* make C compiler happy */ (void) data; (void) option; + weechat_bar_item_update ("buffer_name"); +} + +/* + * irc_config_change_look_item_channel_modes_hide_key: called when the + * "display channel modes + * hide key" option is + * changed + */ + +void +irc_config_change_look_item_channel_modes_hide_key (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + weechat_bar_item_update ("buffer_name"); +} + +/* + * irc_config_change_look_item_nick_modes: called when the "display nick modes" + * option is changed + */ + +void +irc_config_change_look_item_nick_modes (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + weechat_bar_item_update ("input_prompt"); +} + +/* + * irc_config_change_look_item_nick_prefix: called when the "display nick + * prefix" option is changed + */ + +void +irc_config_change_look_item_nick_prefix (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + weechat_bar_item_update ("input_prompt"); } @@ -1378,20 +1394,6 @@ irc_config_init () N_("display message when (un)marking as away"), "off|local|channel", 0, 0, "local", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - irc_config_look_display_channel_modes = weechat_config_new_option ( - irc_config_file, ptr_section, - "display_channel_modes", "boolean", - 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_channel_modes_hide_key = weechat_config_new_option ( - irc_config_file, ptr_section, - "display_channel_modes_hide_key", "boolean", - N_("hide channel key if modes are displayed in \"buffer_name\" bar " - "item (this will hide all channel modes arguments if mode +k is " - "set on channel)"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, - &irc_config_change_look_display_channel_modes_hide_key, NULL, NULL, NULL); irc_config_look_display_ctcp_blocked = weechat_config_new_option ( irc_config_file, ptr_section, "display_ctcp_blocked", "boolean", @@ -1410,18 +1412,38 @@ irc_config_init () 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", - N_("display nick modes in \"input_prompt\" bar item"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, - &irc_config_change_look_display_nick_modes, NULL, NULL, NULL); irc_config_look_display_old_topic = weechat_config_new_option ( irc_config_file, ptr_section, "display_old_topic", "boolean", N_("display old topic when channel topic is changed"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_item_channel_modes = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_channel_modes", "boolean", + N_("display channel modes in \"buffer_name\" bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_channel_modes, NULL, NULL, NULL); + irc_config_look_item_channel_modes_hide_key = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_channel_modes_hide_key", "boolean", + N_("hide channel key if modes are displayed in \"buffer_name\" bar " + "item (this will hide all channel modes arguments if mode +k is " + "set on channel)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, + &irc_config_change_look_item_channel_modes_hide_key, NULL, NULL, NULL); + irc_config_look_item_nick_modes = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_nick_modes", "boolean", + N_("display nick modes in \"input_prompt\" bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_nick_modes, NULL, NULL, NULL); + irc_config_look_item_nick_prefix = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_nick_prefix", "boolean", + N_("display nick prefix in \"input_prompt\" bar item"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &irc_config_change_look_item_nick_prefix, NULL, NULL, NULL); irc_config_look_hide_nickserv_pwd = weechat_config_new_option ( irc_config_file, ptr_section, "hide_nickserv_pwd", "boolean", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 96603a3c5..0fa164a33 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -77,13 +77,14 @@ extern struct t_config_option *irc_config_look_nick_prefix; 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_channel_modes_hide_key; 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_item_channel_modes; +extern struct t_config_option *irc_config_look_item_channel_modes_hide_key; +extern struct t_config_option *irc_config_look_item_nick_modes; +extern struct t_config_option *irc_config_look_item_nick_prefix; extern struct t_config_option *irc_config_look_hide_nickserv_pwd; extern struct t_config_option *irc_config_look_highlight_tags; extern struct t_config_option *irc_config_look_item_display_server; diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c index 83de535f5..0ce4286ad 100644 --- a/src/plugins/irc/irc-mode.c +++ b/src/plugins/irc/irc-mode.c @@ -35,7 +35,8 @@ */ void -irc_mode_channel_set_nick (struct t_irc_channel *channel, const char *nick, +irc_mode_channel_set_nick (struct t_irc_server *server, + struct t_irc_channel *channel, const char *nick, char set_flag, int flag) { struct t_irc_nick *ptr_nick; @@ -44,7 +45,7 @@ irc_mode_channel_set_nick (struct t_irc_channel *channel, const char *nick, { ptr_nick = irc_nick_search (channel, nick); if (ptr_nick) - irc_nick_set (channel, ptr_nick, (set_flag == '+'), flag); + irc_nick_set (server, channel, ptr_nick, (set_flag == '+'), flag); } } @@ -122,7 +123,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '~')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_CHANADMIN); current_arg++; break; @@ -135,7 +136,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '%')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_HALFOP); current_arg++; break; @@ -172,7 +173,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '@')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_OP); current_arg++; break; @@ -180,7 +181,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '~')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_CHANOWNER); current_arg++; break; @@ -188,7 +189,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '-')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_CHANUSER); current_arg++; break; @@ -196,7 +197,7 @@ irc_mode_channel_set (struct t_irc_server *server, ptr_arg = ((current_arg >= 0) && (current_arg < argc)) ? argv[current_arg] : NULL; if (irc_mode_nick_prefix_allowed (server, '+')) - irc_mode_channel_set_nick (channel, ptr_arg, + irc_mode_channel_set_nick (server, channel, ptr_arg, set_flag, IRC_NICK_VOICE); current_arg++; break; diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index cd3aeb34a..576f532d0 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -336,7 +336,7 @@ irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel, */ void -irc_nick_set (struct t_irc_channel *channel, +irc_nick_set (struct t_irc_server *server, struct t_irc_channel *channel, struct t_irc_nick *nick, int set, int flag) { char prefix[2], str_prefix_color[64]; @@ -367,6 +367,9 @@ irc_nick_set (struct t_irc_channel *channel, (nick->flags & IRC_NICK_AWAY) ? "weechat.color.nicklist_away" : "bar_fg", prefix, str_prefix_color, 1); + + if (strcmp (nick->name, server->nick) == 0) + weechat_bar_item_update ("input_prompt"); } /* @@ -507,8 +510,8 @@ irc_nick_count (struct t_irc_channel *channel, int *total, int *count_op, */ void -irc_nick_set_away (struct t_irc_channel *channel, struct t_irc_nick *nick, - int is_away) +irc_nick_set_away (struct t_irc_server *server, struct t_irc_channel *channel, + struct t_irc_nick *nick, int is_away) { if ((weechat_config_integer (irc_config_network_away_check) > 0) && ((weechat_config_integer (irc_config_network_away_check_max_nicks) == 0) || @@ -517,7 +520,7 @@ irc_nick_set_away (struct t_irc_channel *channel, struct t_irc_nick *nick, if (((is_away) && (!(nick->flags & IRC_NICK_AWAY))) || ((!is_away) && (nick->flags & IRC_NICK_AWAY))) { - irc_nick_set (channel, nick, is_away, IRC_NICK_AWAY); + irc_nick_set (server, channel, nick, is_away, IRC_NICK_AWAY); } } } diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h index 4416f014a..adad7d957 100644 --- a/src/plugins/irc/irc-nick.h +++ b/src/plugins/irc/irc-nick.h @@ -62,6 +62,10 @@ struct t_irc_nick extern int irc_nick_valid (struct t_irc_channel *channel, struct t_irc_nick *nick); extern const char *irc_nick_find_color (const char *nickname); +extern void irc_nick_get_gui_infos (struct t_irc_nick *nick, + char *prefix, int *prefix_color, + struct t_gui_buffer *buffer, + struct t_gui_nick_group **group); extern struct t_irc_nick *irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, const char *nickname, @@ -76,7 +80,8 @@ extern struct t_irc_nick *irc_nick_new (struct t_irc_server *server, extern void irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel, struct t_irc_nick *nick, const char *new_nick); -extern void irc_nick_set (struct t_irc_channel *channel, +extern void irc_nick_set (struct t_irc_server *server, + struct t_irc_channel *channel, struct t_irc_nick *nick, int set, int flag); extern void irc_nick_free (struct t_irc_channel *channel, struct t_irc_nick *nick); @@ -86,7 +91,8 @@ extern struct t_irc_nick *irc_nick_search (struct t_irc_channel *channel, extern void irc_nick_count (struct t_irc_channel *channel, int *total, int *count_op, int *count_halfop, int *count_voice, int *count_normal); -extern void irc_nick_set_away (struct t_irc_channel *channel, +extern void irc_nick_set_away (struct t_irc_server *server, + struct t_irc_channel *channel, struct t_irc_nick *nick, int is_away); extern char *irc_nick_as_prefix (struct t_irc_nick *nick, const char *nickname, const char *force_color); diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index fb923e08c..27b98c846 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -2922,7 +2922,7 @@ irc_protocol_cmd_352 (struct t_irc_server *server, const char *command, if (ptr_nick->host) snprintf (ptr_nick->host, length, "%s@%s", argv[4], argv[5]); if (pos_attr) - irc_nick_set_away (ptr_channel, ptr_nick, + irc_nick_set_away (server, ptr_channel, ptr_nick, (pos_attr[0] == 'G') ? 1 : 0); } } diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 7a4a5884b..b757f6e70 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2969,7 +2969,7 @@ irc_server_remove_away () for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel) { if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL) - irc_channel_remove_away (ptr_channel); + irc_channel_remove_away (ptr_server, ptr_channel); } } } @@ -3013,7 +3013,7 @@ irc_server_set_away (struct t_irc_server *server, const char *nick, int is_away) { /* set away flag for nick on channel */ if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL) - irc_channel_set_away (ptr_channel, nick, is_away); + irc_channel_set_away (server, ptr_channel, nick, is_away); /* set/del "away" local variable */ if (is_away)