From 6e668134333e653f2a856efbd215688cea870dc9 Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Sat, 23 Oct 2010 11:46:47 +0000 Subject: [PATCH] cleanup --- src/taskbar/taskbar.c | 5 ++++- src/taskbar/taskbar.h | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index 89267f6..3b61e22 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -60,13 +60,16 @@ void cleanup_taskbar() { Panel *panel; Taskbar *tskbar; - int i, j; + int i, j, k; if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0); for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; for (j=0 ; j < panel->nb_desktop ; j++) { tskbar = &panel->taskbar[j]; + for (k=0; kstate_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]); + } free_area (&tskbar->area); // remove taskbar from the panel panel->area.list = g_slist_remove(panel->area.list, tskbar); diff --git a/src/taskbar/taskbar.h b/src/taskbar/taskbar.h index 72f0cca..9944f15 100644 --- a/src/taskbar/taskbar.h +++ b/src/taskbar/taskbar.h @@ -22,7 +22,6 @@ typedef struct { Area area; int desktop; - int current_state; Pixmap state_pix[TASKBAR_STATE_COUNT]; // task parameters @@ -34,8 +33,6 @@ typedef struct { //always start with area Area area; Background* background[TASKBAR_STATE_COUNT]; - //Background* bg; - //Background* bg_active; } Global_taskbar; -- 2.43.0