From: Mikael Magnusson Date: Thu, 14 Oct 2010 14:05:15 +0000 (+0200) Subject: Fix some rebase artifacts X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d162451a0113da1e012e007f848e38f07348d9d2;p=chaz%2Fopenbox Fix some rebase artifacts --- diff --git a/obrender/theme.c b/obrender/theme.c index 3ab2fd4c..cd641f8e 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -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)); diff --git a/openbox/client_menu.c b/openbox/client_menu.c index ed62a323..c6cdd635 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -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);