irc: rename option irc.color.item_channel_modes to weechat.color.status_modes

4 files changed, 5 insertions, 24 deletions

diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index b97d7fbba..65ccbcc5f 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -578,7 +578,7 @@ void
 irc_channel_set_buffer_modes (struct t_irc_server *server,
                               struct t_irc_channel *channel)
 {
-    char *modes, *modes_without_args;
+    char *modes_without_args;
     const char *pos_space;
 
     if (!server || !channel || !channel->buffer)
@@ -599,18 +599,10 @@ irc_channel_set_buffer_modes (struct t_irc_server *server,
                     channel->modes, pos_space - channel->modes);
             }
         }
-        if (weechat_asprintf (
-                &modes, "%s%s",
-                IRC_COLOR_ITEM_CHANNEL_MODES,
-                (modes_without_args) ? modes_without_args : channel->modes) >= 0)
-        {
-            weechat_buffer_set (channel->buffer, "modes", modes);
-            free (modes);
-        }
-        else
-        {
-            weechat_buffer_set (channel->buffer, "modes", "");
-        }
+        weechat_buffer_set (
+            channel->buffer,
+            "modes",
+            (modes_without_args) ? modes_without_args : channel->modes);
         free (modes_without_args);
     }
     else
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 3f6592c61..b236355ac 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -97,7 +97,6 @@
 #define IRC_COLOR_TOPIC_NEW weechat_color(weechat_config_string(irc_config_color_topic_new))
 #define IRC_COLOR_INPUT_NICK weechat_color(weechat_config_string(irc_config_color_input_nick))
 #define IRC_COLOR_ITEM_AWAY weechat_color(weechat_config_string(irc_config_color_item_away))
-#define IRC_COLOR_ITEM_CHANNEL_MODES weechat_color(weechat_config_string(irc_config_color_item_channel_modes))
 #define IRC_COLOR_ITEM_LAG_COUNTING weechat_color(weechat_config_string(irc_config_color_item_lag_counting))
 #define IRC_COLOR_ITEM_LAG_FINISHED weechat_color(weechat_config_string(irc_config_color_item_lag_finished))
 #define IRC_COLOR_ITEM_NICK_MODES weechat_color(weechat_config_string(irc_config_color_item_nick_modes))
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index aff6e27a8..f10278aad 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -135,7 +135,6 @@ struct t_config_option *irc_config_look_topic_strip_colors = NULL;
 /* IRC config, color section */
 
 struct t_config_option *irc_config_color_input_nick = NULL;
-struct t_config_option *irc_config_color_item_channel_modes = NULL;
 struct t_config_option *irc_config_color_item_lag_counting = NULL;
 struct t_config_option *irc_config_color_item_lag_finished = NULL;
 struct t_config_option *irc_config_color_item_nick_modes = NULL;
@@ -3727,14 +3726,6 @@ irc_config_init ()
             NULL, NULL, NULL,
             &irc_config_change_buffer_input_prompt, NULL, NULL,
             NULL, NULL, NULL);
-        irc_config_color_item_channel_modes = weechat_config_new_option (
-            irc_config_file, irc_config_section_color,
-            "item_channel_modes", "color",
-            N_("color for channel modes, near channel name"),
-            NULL, -1, 0, "default", NULL, 0,
-            NULL, NULL, NULL,
-            &irc_config_change_buffer_modes, NULL, NULL,
-            NULL, NULL, NULL);
         irc_config_color_item_lag_counting = weechat_config_new_option (
             irc_config_file, irc_config_section_color,
             "item_lag_counting", "color",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index eb905becd..9a216593c 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -168,7 +168,6 @@ extern struct t_config_option *irc_config_look_temporary_servers;
 extern struct t_config_option *irc_config_look_topic_strip_colors;
 
 extern struct t_config_option *irc_config_color_input_nick;
-extern struct t_config_option *irc_config_color_item_channel_modes;
 extern struct t_config_option *irc_config_color_item_lag_counting;
 extern struct t_config_option *irc_config_color_item_lag_finished;
 extern struct t_config_option *irc_config_color_item_nick_modes;