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

Fix a memleak introduced by 0dd91ba0e2, some cleanups

Browse source
This commit is contained in:
Mikael Magnusson 2011-08-03 23:01:28 +02:00
parent ef0bfdc743
commit 98b02c6b60
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
obrender/theme.c
View file

@ -303,20 +303,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_COLOR("window.active.label.text.color", theme->title_focused_color, READ_COLOR("window.active.label.text.color", theme->title_focused_color,
RrColorNew(inst, 0x0, 0x0, 0x0)); 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", READ_COLOR_("osd.active.label.text.color",
"osd.label.text.color", "osd.label.text.color",
theme->osd_text_active_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));
READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color, READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff)); 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", READ_COLOR("window.active.button.unpressed.image.color",
theme->titlebut_focused_unpressed_color, theme->titlebut_focused_unpressed_color,
RrColorNew(inst, 0, 0, 0)); RrColorNew(inst, 0, 0, 0));
@ -986,10 +982,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_focused_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) if (theme->title_focused_shadow_color)
theme->osd_text_active_shadow_color = theme->osd_text_active_shadow_color =
RrColorNew(inst, RrColorCopy(theme->title_focused_shadow_color);
theme->title_focused_shadow_color->r,
theme->title_focused_shadow_color->g,
theme->title_focused_shadow_color->b);
else else
theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0); theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_active_shadow_alpha = theme->osd_text_active_shadow_alpha =
@ -1113,10 +1106,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_unfocused_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) if (theme->title_unfocused_shadow_color)
theme->osd_text_inactive_shadow_color = theme->osd_text_inactive_shadow_color =
RrColorNew(inst, RrColorCopy(theme->title_unfocused_shadow_color);
theme->title_unfocused_shadow_color->r,
theme->title_unfocused_shadow_color->g,
theme->title_unfocused_shadow_color->b);
else else
theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0); theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_inactive_shadow_alpha = theme->osd_text_inactive_shadow_alpha =