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

Fix some memleaks

Browse source
This commit is contained in:
Mikael Magnusson 2007-08-06 03:05:09 +02:00
parent d5dc910d6d
commit 7f53478977
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/config.c
View file

@ -320,14 +320,14 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
config_per_app_settings = g_slist_append(config_per_app_settings, config_per_app_settings = g_slist_append(config_per_app_settings,
(gpointer) settings); (gpointer) settings);
g_free(name);
g_free(class);
g_free(role);
name = class = role = NULL;
} }
app = parse_find_node("application", app->next); app = parse_find_node("application", app->next);
} }
g_free(name);
g_free(class);
g_free(role);
} }
/* /*

1
openbox/translate.c
View file

@ -179,5 +179,6 @@ gunichar translate_unichar(guint keycode)
if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0) if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
unikey = 0; unikey = 0;
} }
g_free(key);
return unikey; return unikey;
} }

16
render/theme.c
View file

@ -115,7 +115,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_normal = RrAppearanceNew(inst, 0);
theme->a_menu_selected = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0);
theme->a_menu_disabled = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0);
theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0);
theme->a_menu_text_normal = RrAppearanceNew(inst, 1); theme->a_menu_text_normal = RrAppearanceNew(inst, 1);
theme->a_menu_text_selected = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1);
theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); theme->a_menu_text_disabled = RrAppearanceNew(inst, 1);
@ -543,21 +542,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_HEIGHT,
OB_DEFAULT_ICON_pixel_data); OB_DEFAULT_ICON_pixel_data);
/* the toggled hover mask = the toggled unpressed mask (i.e. no change) */
theme->max_toggled_hover_mask =
RrPixmapMaskCopy(theme->max_toggled_mask);
theme->desk_toggled_hover_mask =
RrPixmapMaskCopy(theme->desk_toggled_mask);
theme->shade_toggled_hover_mask =
RrPixmapMaskCopy(theme->shade_toggled_mask);
/* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/
theme->max_toggled_pressed_mask =
RrPixmapMaskCopy(theme->max_toggled_mask);
theme->desk_toggled_pressed_mask =
RrPixmapMaskCopy(theme->desk_toggled_mask);
theme->shade_toggled_pressed_mask =
RrPixmapMaskCopy(theme->shade_toggled_mask);
/* read the decoration textures */ /* read the decoration textures */
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
"window.active.title.bg", theme->a_focused_title, "window.active.title.bg", theme->a_focused_title,