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

cleanup

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@578 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-10-23 11:46:47 +00:00
parent c01b7f480e
commit 503a4b6845
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/taskbar/taskbar.c
View File

@@ -60,13 +60,16 @@ void cleanup_taskbar()
{ {
Panel *panel; Panel *panel;
Taskbar *tskbar; 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); if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i]; panel = &panel1[i];
for (j=0 ; j < panel->nb_desktop ; j++) { for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[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); free_area (&tskbar->area);
// remove taskbar from the panel // remove taskbar from the panel
panel->area.list = g_slist_remove(panel->area.list, tskbar); panel->area.list = g_slist_remove(panel->area.list, tskbar);

3
src/taskbar/taskbar.h
View File

@@ -22,7 +22,6 @@ typedef struct {
Area area; Area area;
int desktop; int desktop;
int current_state;
Pixmap state_pix[TASKBAR_STATE_COUNT]; Pixmap state_pix[TASKBAR_STATE_COUNT];
// task parameters // task parameters
@@ -34,8 +33,6 @@ typedef struct {
//always start with area //always start with area
Area area; Area area;
Background* background[TASKBAR_STATE_COUNT]; Background* background[TASKBAR_STATE_COUNT];
//Background* bg;
//Background* bg_active;
} Global_taskbar; } Global_taskbar;