Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Code Issues Releases Activity

set current_text_color if needed

Browse Source
This commit is contained in:
Pavel Labath 2010-03-12 19:05:01 +01:00
parent 0584d423e6
commit 88064ef8db
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conky.cc
View File

@ -2438,14 +2438,6 @@ static bool string_to_bool(const char *s)
return false; return false;
} }
// XXX
#if 0 && BUILD_X11
static void __attribute__((unused)) set_default_configurations_for_x(void)
{
current_text_color = default_color;
}
#endif /* BUILD_X11 */
static void set_default_configurations(void) static void set_default_configurations(void)
{ {
#ifdef BUILD_MPD #ifdef BUILD_MPD
@ -3250,6 +3242,9 @@ char load_config_file(const char *f)
} }
#if defined(BUILD_NCURSES) #if defined(BUILD_NCURSES)
#if defined(BUILD_X11) #if defined(BUILD_X11)
if(out_to_x.get(*state)) {
current_text_color = default_color.get(*state);
}
if (out_to_x.get(*state) && (output_methods & TO_NCURSES)) { if (out_to_x.get(*state) && (output_methods & TO_NCURSES)) {
NORM_ERR("out_to_x and out_to_ncurses are incompatible, turning out_to_ncurses off"); NORM_ERR("out_to_x and out_to_ncurses are incompatible, turning out_to_ncurses off");
output_methods &= ~TO_NCURSES; output_methods &= ~TO_NCURSES;