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

5 files changed, 12 insertions, 11 deletions

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;