Merge branch 'm4/master'

[chaz/openbox] / obrender / theme.c

diff --git a/obrender/theme.c b/obrender/theme.c
index c29550b84f6273bb650b5c483786e4ffa5dc9512..cd641f8ec7689bcb909467a01a41991e8efc5f03 100644 (file)
--- a/obrender/theme.c
+++ b/obrender/theme.c
@@ -167,7 +167,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1);
 
     /* initialize theme */
-    theme = g_slice_new0(RrTheme, 1);
+    theme = g_slice_new0(RrTheme);
 
     theme->inst = inst;
     theme->name = g_strdup(name ? name : DEFAULT_THEME);
@@ -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));