M src/taskbar/taskbar.c → 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; k<TASKBAR_STATE_COUNT; ++k) {
+				if (tskbar->state_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);

M src/taskbar/taskbar.h → src/taskbar/taskbar.h

@@ -22,7 +22,6 @@ // always start with area
 	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;