summaryrefslogtreecommitdiff
path: root/src/plugins/irc
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2010-05-01 12:26:59 +0200
committerSebastien Helleu <flashcode@flashtux.org>2010-05-01 12:26:59 +0200
commit1836b40a4a7866200a98e5aa7cb18e41ed7ae0b5 (patch)
tree8574b354df2f2e61f010df0bd6f85d63f299d1c9 /src/plugins/irc
parent1dd211da9a6614ac3681d9913da1f5136ae363cd (diff)
downloadweechat-1836b40a4a7866200a98e5aa7cb18e41ed7ae0b5.zip
Move option irc.color.item_buffer_name_ssl to core (new name: weechat.color.status_name_ssl)
Diffstat (limited to 'src/plugins/irc')
-rw-r--r--src/plugins/irc/irc-color.h6
-rw-r--r--src/plugins/irc/irc-config.c7
-rw-r--r--src/plugins/irc/irc-config.h1
3 files changed, 3 insertions, 11 deletions
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;