summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--src/core/wee-config.c10
-rw-r--r--src/core/wee-config.h2
-rw-r--r--src/plugins/irc/irc-color.h2
4 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 79933367c..0103ed649 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -31,6 +31,7 @@ New features::
* core: add relative move of read marker with `/buffer set unread [+/-]N` (issue #1895)
* core: add access to hashtable properties in evaluation of expressions (issue #1888)
* core: display similar command names when a command is unknown (issue #1877)
+ * core: rename option weechat.color.status_name_ssl to weechat.color.status_name_tls
* core, plugins: make many identifiers case sensitive (issue #1872, issue #398, bug #32213)
* core: add item "mouse_status" in default status bar, change default color to lightgreen
* api: add function config_set_version (issue #1238)
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 2d0e157aa..fc512b520 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -282,7 +282,7 @@ struct t_config_option *config_color_status_filter = NULL;
struct t_config_option *config_color_status_more = NULL;
struct t_config_option *config_color_status_mouse = NULL;
struct t_config_option *config_color_status_name = NULL;
-struct t_config_option *config_color_status_name_ssl = NULL;
+struct t_config_option *config_color_status_name_tls = NULL;
struct t_config_option *config_color_status_nicklist_count = NULL;
struct t_config_option *config_color_status_number = NULL;
struct t_config_option *config_color_status_time = NULL;
@@ -4513,11 +4513,11 @@ config_weechat_init_options ()
NULL, NULL, NULL,
&config_change_color, NULL, NULL,
NULL, NULL, NULL);
- config_color_status_name_ssl = config_file_new_option (
+ config_color_status_name_tls = config_file_new_option (
weechat_config_file, weechat_config_section_color,
- "status_name_ssl", "color",
+ "status_name_tls", "color",
N_("text color for current buffer name in status bar, if data are "
- "secured with a protocol like SSL"),
+ "secured with a protocol like TLS"),
NULL, -1, 0, "lightgreen", NULL, 0,
NULL, NULL, NULL,
&config_change_color, NULL, NULL,
@@ -4745,7 +4745,7 @@ config_weechat_init_options ()
"gnutls_ca_system", "boolean",
N_("load system's default trusted certificate authorities on startup; "
"this can be turned off to save some memory only if you are not "
- "using SSL connections at all"),
+ "using TLS connections at all"),
NULL, 0, 0, "on", NULL, 0,
NULL, NULL, NULL,
&config_change_network_gnutls_ca, NULL, NULL,
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index f1963426b..e9f901201 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -329,7 +329,7 @@ extern struct t_config_option *config_color_status_filter;
extern struct t_config_option *config_color_status_more;
extern struct t_config_option *config_color_status_mouse;
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_name_tls;
extern struct t_config_option *config_color_status_nicklist_count;
extern struct t_config_option *config_color_status_number;
extern struct t_config_option *config_color_status_time;
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 3d966754b..95b18de2e 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -82,7 +82,7 @@
#define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice))
#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_STATUS_NAME_SSL weechat_color("status_name_tls")
#define IRC_COLOR_MESSAGE_JOIN weechat_color(weechat_config_string(irc_config_color_message_join))
#define IRC_COLOR_MESSAGE_ACCOUNT weechat_color(weechat_config_string(irc_config_color_message_account))
#define IRC_COLOR_MESSAGE_CHGHOST weechat_color(weechat_config_string(irc_config_color_message_chghost))