Move option irc.color.item_buffer_name_ssl to core (new name: weechat.color.status_name_ssl)

21 files changed, 120 insertions, 72 deletions

diff --git a/ChangeLog b/ChangeLog
index 60174503a..8753b82d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@ Version 0.3.3 (under dev!)
   process)
 * irc: add new options irc.network.autoreconnect_delay_growing and
   irc.network.autoreconnect_delay_max (task #10338)
-* irc: add new option irc.color.item_buffer_name_ssl (task #10339)
+* irc: add new option weechat.color.status_name_ssl (task #10339)
 * irc: try other nick when connecting to server and receiving message 437
   (nick unavailable)
 * irc: set buffer local variable "away" when opening new channel (bug #29618)
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 3a8e0864a..0d350af70 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -8,11 +8,6 @@
 ** type: color
 ** values: a color name (default value: yellow)
 
-* *irc.color.item_buffer_name_ssl*
-** description: color for buffer name when connected using SSL to server
-** type: color
-** values: a color name (default value: lightgreen)
-
 * *irc.color.item_channel_modes*
 ** description: color for channel modes, near channel name
 ** type: color
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index c7eb572f7..a523dc9a9 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -278,6 +278,11 @@
 ** type: color
 ** values: a color name (default value: white)
 
+* *weechat.color.status_name_ssl*
+** description: text color for current buffer name in status bar, if data are secured with a protocol like SSL
+** type: color
+** values: a color name (default value: lightgreen)
+
 * *weechat.color.status_number*
 ** description: text color for current buffer number in status bar
 ** type: color
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 096063e50..35d4bc3fc 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -8,11 +8,6 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: yellow)
 
-* *irc.color.item_buffer_name_ssl*
-** description: couleur pour le nom du tampon lorsque la connexion au serveur utilise SSL
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: lightgreen)
-
 * *irc.color.item_channel_modes*
 ** description: couleur pour les modes du canal, à côté du nom du canal
 ** type: couleur
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index d90694497..8d2d2ee22 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -278,6 +278,11 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: white)
 
+* *weechat.color.status_name_ssl*
+** description: couleur du texte pour le nom du tampon courant dans la barre de statut, si les données sont sécurisées avec un protocole tel que SSL
+** type: couleur
+** valeurs: un nom de couleur (valeur par défaut: lightgreen)
+
 * *weechat.color.status_number*
 ** description: couleur du texte pour le numéro du tampon courant dans la barre de statut
 ** type: couleur
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 6a20bd9d6..7806758af 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -8,11 +8,6 @@
 ** tipo: colore
 ** valori: un nome colore (valore predefinito: yellow)
 
-* *irc.color.item_buffer_name_ssl*
-** descrizione: color for buffer name when connected using SSL to server
-** tipo: colore
-** valori: un nome colore (valore predefinito: lightgreen)
-
 * *irc.color.item_channel_modes*
 ** descrizione: colore per le modalità dei canali, vicino ai nomi dei canali
 ** tipo: colore
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index d5de0be2b..edf85be89 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -278,6 +278,11 @@
 ** tipo: colore
 ** valori: un nome colore (valore predefinito: white)
 
+* *weechat.color.status_name_ssl*
+** descrizione: text color for current buffer name in status bar, if data are secured with a protocol like SSL
+** tipo: colore
+** valori: un nome colore (valore predefinito: lightgreen)
+
 * *weechat.color.status_number*
 ** descrizione: colore del testo per il numero del buffer corrente nella barra di stato
 ** tipo: colore
diff --git a/po/cs.po b/po/cs.po
index 7a30e03b8..c6751f85b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1983,6 +1983,12 @@ msgstr "barva textu pro aktuální číslo bufferu ve stavovém řádku"
 msgid "text color for current buffer name in status bar"
 msgstr "barva textu pro aktuální jméno bufferu ve stavovém řádku"
 
+#, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "barva textu pro aktuální jméno bufferu ve stavovém řádku"
+
 msgid "text color for filter indicator in status bar"
 msgstr "barva textu pro indikátor filtru ve stavovém řádku"
 
@@ -4493,10 +4499,6 @@ msgstr "barva položek, které jsou pryč"
 msgid "color for channel modes, near channel name"
 msgstr "barva módů kanálu, blízko jména kanálu"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s%s: nejste připojen k serveru"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6488,3 +6490,7 @@ msgstr "Argumenty"
 
 msgid "Pointer"
 msgstr "Ukazatel"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s%s: nejste připojen k serveru"
diff --git a/po/de.po b/po/de.po
index cd615397f..166ea5247 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Nils G <weechatter@arcor.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2059,6 +2059,12 @@ msgstr "Farbe des aktuellen Channels in der Statuszeile"
 msgid "text color for current buffer name in status bar"
 msgstr "Farbe des aktuellen Buffer-Namens in der Statuszeile"
 
+#, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "Farbe des aktuellen Buffer-Namens in der Statuszeile"
+
 msgid "text color for filter indicator in status bar"
 msgstr "Farbe des Filterkennzeichens in der Statuszeile"
 
@@ -4666,10 +4672,6 @@ msgstr "Farbe des Abwesenheit-Textes in der Eingabezeile"
 msgid "color for channel modes, near channel name"
 msgstr "Farbe der Channel-Modes (neben dem Channelnamen)"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s%s: Es besteht keine Verbindung zum Server"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6708,3 +6710,7 @@ msgstr "Argumente"
 
 msgid "Pointer"
 msgstr "Pointer"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s%s: Es besteht keine Verbindung zum Server"
diff --git a/po/es.po b/po/es.po
index adb64f4f8..a401f5749 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:50+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2013,6 +2013,12 @@ msgstr "color para el número del buffer actual en la barra de estado"
 msgid "text color for current buffer name in status bar"
 msgstr "color para el nombre del buffer actual en la barra de estado"
 
+#, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "color para el nombre del buffer actual en la barra de estado"
+
 msgid "text color for filter indicator in status bar"
 msgstr "color para el indicador de filtro en la barra de estado"
 
@@ -4560,10 +4566,6 @@ msgstr "color para el texto \"ausente\" en al barra de entrada"
 msgid "color for channel modes, near channel name"
 msgstr "color para los modos del canal, junto al nombre del canal"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s%s: no estas conectado a ningún servidor"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6600,3 +6602,7 @@ msgstr "Argumentos"
 
 msgid "Pointer"
 msgstr "Puntero"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s%s: no estas conectado a ningún servidor"
diff --git a/po/fr.po b/po/fr.po
index 5a55f62e3..65389699c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
-"PO-Revision-Date: 2010-04-23 22:48+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
+"PO-Revision-Date: 2010-05-01 12:23+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2022,6 +2022,13 @@ msgstr ""
 msgid "text color for current buffer name in status bar"
 msgstr "couleur du texte pour le nom du tampon courant dans la barre de statut"
 
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr ""
+"couleur du texte pour le nom du tampon courant dans la barre de statut, si "
+"les données sont sécurisées avec un protocole tel que SSL"
+
 msgid "text color for filter indicator in status bar"
 msgstr "couleur du texte pour l'indicateur de filtrage dans la barre de statut"
 
@@ -4595,10 +4602,6 @@ msgstr "couleur pour l'objet away"
 msgid "color for channel modes, near channel name"
 msgstr "couleur pour les modes du canal, à côté du nom du canal"
 
-msgid "color for buffer name when connected using SSL to server"
-msgstr ""
-"couleur pour le nom du tampon lorsque la connexion au serveur utilise SSL"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
diff --git a/po/hu.po b/po/hu.po
index d11f4446d..7d3d53e54 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1825,6 +1825,12 @@ msgid "text color for current buffer name in status bar"
 msgstr "aktuális szoba színe a státuszsorban"
 
 #, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "aktuális szoba színe a státuszsorban"
+
+#, fuzzy
 msgid "text color for filter indicator in status bar"
 msgstr "aktuális szoba színe a státuszsorban"
 
@@ -4312,10 +4318,6 @@ msgstr "távollevő felhasználók nevének színe"
 msgid "color for channel modes, near channel name"
 msgstr "szobanevek színe az eseményekben"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s nincs csatlakozva szerverhez!\n"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6290,3 +6292,7 @@ msgstr "fogadó típusa [paraméterek]"
 #, fuzzy
 msgid "Pointer"
 msgstr "perc"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s nincs csatlakozva szerverhez!\n"
diff --git a/po/it.po b/po/it.po
index a8ec7e518..8e0910b7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weechat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2008,6 +2008,12 @@ msgstr ""
 msgid "text color for current buffer name in status bar"
 msgstr "colore del testo per il nome del buffer corrente nella barra di stato"
 
+#, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "colore del testo per il nome del buffer corrente nella barra di stato"
+
 msgid "text color for filter indicator in status bar"
 msgstr "colore del testo per l'indicatore di filtro nella barra di stato"
 
@@ -4568,10 +4574,6 @@ msgstr "colore per l'elemento assenza"
 msgid "color for channel modes, near channel name"
 msgstr "colore per le modalità dei canali, vicino ai nomi dei canali"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s%s: non connesso al server"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6584,3 +6586,7 @@ msgstr "Argomenti"
 
 msgid "Pointer"
 msgstr "Puntatore"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s%s: non connesso al server"
diff --git a/po/pl.po b/po/pl.po
index 040c14594..ddfd9cf9a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: Polish\n"
@@ -2014,6 +2014,12 @@ msgstr "kolor numeru obecnego bufora w pasku statusu"
 msgid "text color for current buffer name in status bar"
 msgstr "kolor nazwy obecnego bufora w pasku statusu"
 
+#, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "kolor nazwy obecnego bufora w pasku statusu"
+
 msgid "text color for filter indicator in status bar"
 msgstr "kolor wskaźnika filtru w pasku statusu"
 
@@ -4538,10 +4544,6 @@ msgstr "kolor elementu nieobecności"
 msgid "color for channel modes, near channel name"
 msgstr "kolor trybów kanału, przy nazwie kanału"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s%s: nie jesteś połączony z serwerem"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6533,3 +6535,7 @@ msgstr "Argumenty"
 
 msgid "Pointer"
 msgstr "Wskaźnik"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s%s: nie jesteś połączony z serwerem"
diff --git a/po/ru.po b/po/ru.po
index 52162ae02..765dc0b79 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\n"
 "PO-Revision-Date: 2010-04-18 10:51+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1834,6 +1834,12 @@ msgid "text color for current buffer name in status bar"
 msgstr "цвет текущего канала в строке состояния"
 
 #, fuzzy
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "цвет текущего канала в строке состояния"
+
+#, fuzzy
 msgid "text color for filter indicator in status bar"
 msgstr "цвет текущего канала в строке состояния"
 
@@ -4312,10 +4318,6 @@ msgstr "цвет отошедших ников"
 msgid "color for channel modes, near channel name"
 msgstr "цвет имён при действиях"
 
-#, fuzzy
-msgid "color for buffer name when connected using SSL to server"
-msgstr "%s вы не подключены к серверу\n"
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -6287,3 +6289,7 @@ msgstr "адресат тип [аргументы]"
 #, fuzzy
 msgid "Pointer"
 msgstr "минута"
+
+#, fuzzy
+#~ msgid "color for buffer name when connected using SSL to server"
+#~ msgstr "%s вы не подключены к серверу\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index b1173d990..35dd69720 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-04-28 15:04+0200\n"
+"POT-Creation-Date: 2010-05-01 12:22+0200\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"
@@ -1559,6 +1559,11 @@ msgstr ""
 msgid "text color for current buffer name in status bar"
 msgstr ""
 
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr ""
+
 msgid "text color for filter indicator in status bar"
 msgstr ""
 
@@ -3688,9 +3693,6 @@ msgstr ""
 msgid "color for channel modes, near channel name"
 msgstr ""
 
-msgid "color for buffer name when connected using SSL to server"
-msgstr ""
-
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 3989b6181..29e536ff3 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -141,6 +141,7 @@ struct t_config_option *config_color_chat_text_found_bg;
 struct t_config_option *config_color_chat_value;
 struct t_config_option *config_color_status_number;
 struct t_config_option *config_color_status_name;
+struct t_config_option *config_color_status_name_ssl;
 struct t_config_option *config_color_status_filter;
 struct t_config_option *config_color_status_data_msg;
 struct t_config_option *config_color_status_data_private;
@@ -1746,6 +1747,13 @@ config_weechat_init_options ()
         N_("text color for current buffer name in status bar"),
         NULL, -1, 0, "white", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
+    config_color_status_name_ssl = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "status_name_ssl", "color",
+        N_("text color for current buffer name in status bar, if data are "
+           "secured with a protocol like SSL"),
+        NULL, -1, 0, "lightgreen", NULL, 0,
+        NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_status_filter = config_file_new_option (
         weechat_config_file, ptr_section,
         "status_filter", "color",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index a53f57b63..005935496 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -152,6 +152,7 @@ extern struct t_config_option *config_color_chat_text_found_bg;
 extern struct t_config_option *config_color_chat_value;
 extern struct t_config_option *config_color_status_number;
 extern struct t_config_option *config_color_status_name;
+extern struct t_config_option *config_color_status_name_ssl;
 extern struct t_config_option *config_color_status_filter;
 extern struct t_config_option *config_color_status_data_msg;
 extern struct t_config_option *config_color_status_data_private;
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 6e32b9f25..0529c0681 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -74,9 +74,9 @@
 #define IRC_COLOR_BAR_FG weechat_color("bar_fg")
 #define IRC_COLOR_BAR_BG weechat_color("bar_bg")
 #define IRC_COLOR_BAR_DELIM weechat_color("bar_delim")
-#define IRC_COLOR_STATUS_NUMBER weechat_color(weechat_config_string(weechat_config_get("weechat.color.status_number")))
-#define IRC_COLOR_STATUS_NAME weechat_color(weechat_config_string(weechat_config_get("weechat.color.status_name")))
-#define IRC_COLOR_STATUS_NAME_SSL weechat_color(weechat_config_string(irc_config_color_item_buffer_name_ssl))
+#define IRC_COLOR_STATUS_NUMBER weechat_color("status_number")
+#define IRC_COLOR_STATUS_NAME weechat_color("status_name")
+#define IRC_COLOR_STATUS_NAME_SSL weechat_color("status_name_ssl")
 #define IRC_COLOR_MESSAGE_JOIN weechat_color(weechat_config_string(irc_config_color_message_join))
 #define IRC_COLOR_MESSAGE_QUIT weechat_color(weechat_config_string(irc_config_color_message_quit))
 #define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice))
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 43e6754f5..18037a3a9 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -87,7 +87,6 @@ struct t_config_option *irc_config_color_notice;
 struct t_config_option *irc_config_color_input_nick;
 struct t_config_option *irc_config_color_item_away;
 struct t_config_option *irc_config_color_item_channel_modes;
-struct t_config_option *irc_config_color_item_buffer_name_ssl;
 
 /* IRC config, network section */
 
@@ -1638,12 +1637,6 @@ irc_config_init ()
         N_("color for channel modes, near channel name"),
         NULL, -1, 0, "default", NULL, 0, NULL, NULL,
         &irc_config_change_color_item_buffer_name, NULL, NULL, NULL);
-    irc_config_color_item_buffer_name_ssl = weechat_config_new_option (
-        irc_config_file, ptr_section,
-        "item_buffer_name_ssl", "color",
-        N_("color for buffer name when connected using SSL to server"),
-        NULL, -1, 0, "lightgreen", NULL, 0, NULL, NULL,
-        &irc_config_change_color_item_buffer_name, NULL, NULL, NULL);
     
     /* network */
     ptr_section = weechat_config_new_section (irc_config_file, "network",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index f0ef86f7e..b73e79417 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -105,7 +105,6 @@ extern struct t_config_option *irc_config_color_notice;
 extern struct t_config_option *irc_config_color_input_nick;
 extern struct t_config_option *irc_config_color_item_away;
 extern struct t_config_option *irc_config_color_item_channel_modes;
-extern struct t_config_option *irc_config_color_item_buffer_name_ssl;
 
 extern struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_max;