all repos — openbox @ 98b02c6b60bbde2a5db026b3ee3e6e6dc44d1a92

openbox fork - make it a bit more like ryudo 

Fix a memleak introduced by 0dd91ba0e2382a8f6177f501f8a0b26e0daf26a8, some cleanups
Mikael Magnusson mikachu@gmail.com
commit

98b02c6b60bbde2a5db026b3ee3e6e6dc44d1a92

parent

ef0bfdc743dfaf783e8d6f776e8391b8546f9598

1 files changed, 5 insertions(+), 15 deletions(-)

jump to
M obrender/theme.c → obrender/theme.c 
@@ -303,18 +303,14 @@ 
     READ_COLOR("window.active.label.text.color", theme->title_focused_color,
                RrColorNew(inst, 0x0, 0x0, 0x0));
 
+    READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
+               RrColorCopy(theme->title_unfocused_color));
+
     READ_COLOR_("osd.active.label.text.color",
                 "osd.label.text.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));
-
     READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
-               RrColorNew(inst, 0xff, 0xff, 0xff));
-
-    READ_COLOR("window.inactive.label.text.color",
-               theme->title_unfocused_color,
                RrColorNew(inst, 0xff, 0xff, 0xff));
 
     READ_COLOR("window.active.button.unpressed.image.color",

@@ -986,10 +982,7 @@ theme->osd_hilite_label->texture[0].data.text.shadow_offset_y =
             theme->a_focused_label->texture[0].data.text.shadow_offset_y;
         if (theme->title_focused_shadow_color)
             theme->osd_text_active_shadow_color =
-                RrColorNew(inst,
-                           theme->title_focused_shadow_color->r,
-                           theme->title_focused_shadow_color->g,
-                           theme->title_focused_shadow_color->b);
+                RrColorCopy(theme->title_focused_shadow_color);
         else
             theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
         theme->osd_text_active_shadow_alpha =

@@ -1113,10 +1106,7 @@ theme->osd_unhilite_label->texture[0].data.text.shadow_offset_y =
             theme->a_unfocused_label->texture[0].data.text.shadow_offset_y;
         if (theme->title_unfocused_shadow_color)
             theme->osd_text_inactive_shadow_color =
-                RrColorNew(inst,
-                           theme->title_unfocused_shadow_color->r,
-                           theme->title_unfocused_shadow_color->g,
-                           theme->title_unfocused_shadow_color->b);
+                RrColorCopy(theme->title_unfocused_shadow_color);
         else
             theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
         theme->osd_text_inactive_shadow_alpha =