diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-07-27 19:57:38 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-07-27 19:57:38 +0000 |
| commit | 632b2af7a8283eff025456d3bb39a362311f4182 (patch) | |
| tree | 9fc03cf1ac8d906f314f9eae88b63851b0d5a417 /render | |
| parent | 2eb5721416309089d855ec8362d4ec131f595c21 (diff) | |
fix mem leaks/crashes
Diffstat (limited to 'render')
| -rw-r--r-- | render/theme.c | 26 | ||||
| -rw-r--r-- | render/theme.h | 2 |
2 files changed, 22 insertions, 6 deletions
diff --git a/render/theme.c b/render/theme.c index 68d9888f..7f67b47a 100644 --- a/render/theme.c +++ b/render/theme.c @@ -184,12 +184,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.button.pressed.focus.picColor", &theme->titlebut_focused_pressed_color)) theme->titlebut_focused_pressed_color = - theme->titlebut_focused_unpressed_color; + RrColorNew(inst, + theme->titlebut_focused_unpressed_color->r, + theme->titlebut_focused_unpressed_color->g, + theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, "window.button.pressed.unfocus.picColor", &theme->titlebut_unfocused_pressed_color)) theme->titlebut_unfocused_pressed_color = - theme->titlebut_unfocused_unpressed_color; + RrColorNew(inst, + theme->titlebut_unfocused_unpressed_color->r, + theme->titlebut_unfocused_unpressed_color->g, + theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, "window.button.disabled.focus.picColor", &theme->titlebut_disabled_focused_color)) @@ -198,17 +204,23 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.button.disabled.unfocus.picColor", &theme->titlebut_disabled_unfocused_color)) - theme->titlebut_hover_unfocused_color = RrColorNew(inst, 0, 0, 0); + theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "window.button.hover.focus.picColor", &theme->titlebut_hover_focused_color)) theme->titlebut_hover_focused_color = - theme->titlebut_focused_unpressed_color; + RrColorNew(inst, + theme->titlebut_focused_unpressed_color->r, + theme->titlebut_focused_unpressed_color->g, + theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, "window.button.hover.unfocus.picColor", &theme->titlebut_hover_unfocused_color)) theme->titlebut_hover_unfocused_color = - theme->titlebut_unfocused_unpressed_color; + RrColorNew(inst, + theme->titlebut_unfocused_unpressed_color->r, + theme->titlebut_unfocused_unpressed_color->g, + theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, "menu.title.textColor", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); @@ -694,6 +706,10 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->cb_focused_color); RrColorFree(theme->title_unfocused_color); RrColorFree(theme->title_focused_color); + RrColorFree(theme->titlebut_disabled_focused_color); + RrColorFree(theme->titlebut_disabled_unfocused_color); + RrColorFree(theme->titlebut_hover_focused_color); + RrColorFree(theme->titlebut_hover_unfocused_color); RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_pressed_color); RrColorFree(theme->titlebut_unfocused_unpressed_color); diff --git a/render/theme.h b/render/theme.h index 18464c36..f7c0dc67 100644 --- a/render/theme.h +++ b/render/theme.h @@ -29,7 +29,7 @@ struct _RrTheme { RrColor *title_focused_color; RrColor *title_unfocused_color; RrColor *titlebut_disabled_focused_color; - RrColor *titlebut_disabled_unfocused_color; + RrColor *titlebut_disabled_unfocused_color; RrColor *titlebut_hover_focused_color; RrColor *titlebut_hover_unfocused_color; RrColor *titlebut_focused_pressed_color; |