summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/weeconfig.c12
-rw-r--r--src/common/weeconfig.h4
-rw-r--r--src/gui/curses/gui-display.c4
-rw-r--r--src/gui/gui.h2
-rw-r--r--weechat/src/common/weeconfig.c12
-rw-r--r--weechat/src/common/weeconfig.h4
-rw-r--r--weechat/src/gui/curses/gui-display.c4
-rw-r--r--weechat/src/gui/gui.h2
8 files changed, 22 insertions, 22 deletions
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 8722b7d17..dc0916cb4 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -256,8 +256,8 @@ int cfg_col_chat_channel;
int cfg_col_chat_dark;
int cfg_col_chat_highlight;
int cfg_col_chat_bg;
-int cfg_col_chat_marker;
-int cfg_col_chat_marker_bg;
+int cfg_col_chat_read_marker;
+int cfg_col_chat_read_marker_bg;
int cfg_col_status;
int cfg_col_status_delimiters;
int cfg_col_status_channel;
@@ -372,14 +372,14 @@ t_config_option weechat_options_colors[] =
N_("background for chat window"),
OPTION_TYPE_COLOR, 0, 0, 0,
"default", NULL, &cfg_col_chat_bg, NULL, &config_change_color },
- { "col_chat_marker", N_("color for unread data marker"),
+ { "col_chat_read_marker", N_("color for unread data marker"),
N_("color for unread data marker"),
OPTION_TYPE_COLOR, 0, 0, 0,
- "yellow", NULL, &cfg_col_chat_marker, NULL, &config_change_color },
- { "col_chat_marker_bg", N_("background for unread data marker"),
+ "yellow", NULL, &cfg_col_chat_read_marker, NULL, &config_change_color },
+ { "col_chat_read_marker_bg", N_("background for unread data marker"),
N_("background for unread data marker"),
OPTION_TYPE_COLOR, 0, 0, 0,
- "magenta", NULL, &cfg_col_chat_marker_bg, NULL, &config_change_color },
+ "magenta", NULL, &cfg_col_chat_read_marker_bg, NULL, &config_change_color },
/* status window */
{ "col_status", N_("color for status bar"),
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index e74d2db51..6d17bb9ab 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -129,8 +129,8 @@ extern int cfg_col_chat_channel;
extern int cfg_col_chat_dark;
extern int cfg_col_chat_highlight;
extern int cfg_col_chat_bg;
-extern int cfg_col_chat_marker;
-extern int cfg_col_chat_marker_bg;
+extern int cfg_col_chat_read_marker;
+extern int cfg_col_chat_read_marker_bg;
extern int cfg_col_status;
extern int cfg_col_status_delimiters;
extern int cfg_col_status_channel;
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 4080e6bb1..b5514afdd 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -1362,7 +1362,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
{
- gui_window_chat_set_weechat_color (window, COLOR_WIN_CHAT_MARKER);
+ gui_window_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (window->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
@@ -3161,7 +3161,7 @@ gui_init_weechat_colors ()
gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
- gui_color[COLOR_WIN_CHAT_MARKER] = gui_color_build (COLOR_WIN_CHAT_MARKER, cfg_col_chat_marker, cfg_col_chat_marker_bg);
+ gui_color[COLOR_WIN_CHAT_READ_MARKER] = gui_color_build (COLOR_WIN_CHAT_READ_MARKER, cfg_col_chat_read_marker, cfg_col_chat_read_marker_bg);
gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 72c54960a..4ffb20c80 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -58,7 +58,7 @@ enum t_weechat_color
COLOR_WIN_CHAT_CHANNEL,
COLOR_WIN_CHAT_DARK,
COLOR_WIN_CHAT_HIGHLIGHT,
- COLOR_WIN_CHAT_MARKER,
+ COLOR_WIN_CHAT_READ_MARKER,
COLOR_WIN_STATUS,
COLOR_WIN_STATUS_DELIMITERS,
COLOR_WIN_STATUS_CHANNEL,
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 8722b7d17..dc0916cb4 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -256,8 +256,8 @@ int cfg_col_chat_channel;
int cfg_col_chat_dark;
int cfg_col_chat_highlight;
int cfg_col_chat_bg;
-int cfg_col_chat_marker;
-int cfg_col_chat_marker_bg;
+int cfg_col_chat_read_marker;
+int cfg_col_chat_read_marker_bg;
int cfg_col_status;
int cfg_col_status_delimiters;
int cfg_col_status_channel;
@@ -372,14 +372,14 @@ t_config_option weechat_options_colors[] =
N_("background for chat window"),
OPTION_TYPE_COLOR, 0, 0, 0,
"default", NULL, &cfg_col_chat_bg, NULL, &config_change_color },
- { "col_chat_marker", N_("color for unread data marker"),
+ { "col_chat_read_marker", N_("color for unread data marker"),
N_("color for unread data marker"),
OPTION_TYPE_COLOR, 0, 0, 0,
- "yellow", NULL, &cfg_col_chat_marker, NULL, &config_change_color },
- { "col_chat_marker_bg", N_("background for unread data marker"),
+ "yellow", NULL, &cfg_col_chat_read_marker, NULL, &config_change_color },
+ { "col_chat_read_marker_bg", N_("background for unread data marker"),
N_("background for unread data marker"),
OPTION_TYPE_COLOR, 0, 0, 0,
- "magenta", NULL, &cfg_col_chat_marker_bg, NULL, &config_change_color },
+ "magenta", NULL, &cfg_col_chat_read_marker_bg, NULL, &config_change_color },
/* status window */
{ "col_status", N_("color for status bar"),
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index e74d2db51..6d17bb9ab 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -129,8 +129,8 @@ extern int cfg_col_chat_channel;
extern int cfg_col_chat_dark;
extern int cfg_col_chat_highlight;
extern int cfg_col_chat_bg;
-extern int cfg_col_chat_marker;
-extern int cfg_col_chat_marker_bg;
+extern int cfg_col_chat_read_marker;
+extern int cfg_col_chat_read_marker_bg;
extern int cfg_col_status;
extern int cfg_col_status_delimiters;
extern int cfg_col_status_channel;
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 4080e6bb1..b5514afdd 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -1362,7 +1362,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
{
- gui_window_chat_set_weechat_color (window, COLOR_WIN_CHAT_MARKER);
+ gui_window_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (window->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
@@ -3161,7 +3161,7 @@ gui_init_weechat_colors ()
gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
- gui_color[COLOR_WIN_CHAT_MARKER] = gui_color_build (COLOR_WIN_CHAT_MARKER, cfg_col_chat_marker, cfg_col_chat_marker_bg);
+ gui_color[COLOR_WIN_CHAT_READ_MARKER] = gui_color_build (COLOR_WIN_CHAT_READ_MARKER, cfg_col_chat_read_marker, cfg_col_chat_read_marker_bg);
gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h
index 72c54960a..4ffb20c80 100644
--- a/weechat/src/gui/gui.h
+++ b/weechat/src/gui/gui.h
@@ -58,7 +58,7 @@ enum t_weechat_color
COLOR_WIN_CHAT_CHANNEL,
COLOR_WIN_CHAT_DARK,
COLOR_WIN_CHAT_HIGHLIGHT,
- COLOR_WIN_CHAT_MARKER,
+ COLOR_WIN_CHAT_READ_MARKER,
COLOR_WIN_STATUS,
COLOR_WIN_STATUS_DELIMITERS,
COLOR_WIN_STATUS_CHANNEL,