Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Memory management review: match char-malloc/strdup-free, gchar-g_str*/g_free; set pointers to null after free; initialize fonts/backgrounds correctly when missing from config

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@748 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-04-11 09:51:10 +00:00
committed by mrovi9000@gmail.com
parent 321ccc0794
commit af003d0e19
18 changed files with 228 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/launcher/launcher.c
View File

@@ -96,7 +96,7 @@ void init_launcher_panel(void *p)
launcher->area._resize = resize_launcher;
launcher->area.resize = 1;
launcher->area.redraw = 1;
if (launcher->area.bg == 0)
if (!launcher->area.bg)
launcher->area.bg = &g_array_index(backgrounds, Background, 0);
// check consistency
@@ -118,20 +118,26 @@ void cleanup_launcher()
if (xsettings_client)
xsettings_client_destroy(xsettings_client);
for (i = 0 ; i < nb_panel ; i++) {
xsettings_client = NULL;
for (i = 0; i < nb_panel; i++) {
Panel *panel = &panel1[i];
Launcher *launcher = &panel->launcher;
cleanup_launcher_theme(launcher);
}
for (l = panel_config.launcher.list_apps; l ; l = l->next) {
free(l->data);
}
g_slist_free(panel_config.launcher.list_apps);
panel_config.launcher.list_apps = NULL;
free(icon_theme_name_config);
icon_theme_name_config = NULL;
free(icon_theme_name_xsettings);
icon_theme_name_xsettings = NULL;
launcher_enabled = 0;
}
@@ -153,9 +159,9 @@ void cleanup_launcher_theme(Launcher *launcher)
free(launcherIcon);
}
g_slist_free(launcher->list_icons);
launcher->list_icons = NULL;
free_themes(launcher->list_themes);
launcher->list_icons = NULL;
launcher->list_themes = NULL;
}