nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some rebase artifacts

Browse source
This commit is contained in:
Mikael Magnusson 2010-10-14 16:05:15 +02:00
parent da5441ecec
commit d162451a01
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
obrender/theme.c
View file

@ -295,7 +295,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_COLOR_("osd.active.label.text.color",
"osd.label.text.color",
theme->osd_color, RrColorCopy(theme->title_focused_color));
theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
RrColorCopy(theme->title_unfocused_color));

2
openbox/client_menu.c
View file

@ -408,7 +408,7 @@ void client_menu_startup(void)
set_icon_color(e);
e = menu_add_normal(menu, CLIENT_SHADE, _("_Roll up/down"), NULL, TRUE);
e->data.normal.mask = ob_rr_theme->shade_mask;
e->data.normal.mask = ob_rr_theme->btn_shade->mask;
set_icon_color(e);
menu_add_normal(menu, CLIENT_DECORATE, _("Un/_Decorate"), NULL, TRUE);