From: Dana Jansens Date: Sun, 11 Aug 2013 20:12:25 +0000 (-0400) Subject: window.inactive.label.text.color should default to white. X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=aa1fe695a5bf4625b2d2fc9a26d950e49a36f191;hp=f3873cac4add6865cff6ca01abd65a31dc1b33ad window.inactive.label.text.color should default to white. Currently it defaults to itself, which is NULL, and causes a crash. The spec http://openbox.org/wiki/Help:Themes#window.inactive.label.text.color claims that the default is white. In 98b02c6b60bbde2a5db026b3ee3e6e6dc44d1a92 we had this property being read twice, once with the NULL backup and once with white. It seems that we kept the wrong one, so just switching this to white now. --- diff --git a/obrender/theme.c b/obrender/theme.c index d5ce8659..87ca5c89 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -318,7 +318,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrColorNew(inst, 0x0, 0x0, 0x0)); READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, - RrColorCopy(theme->title_unfocused_color)); + RrColorNew(inst, 0xff, 0xff, 0xff)); READ_COLOR_("osd.active.label.text.color", "osd.label.text.color",