X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=bb351fe1792096f87c5b92d74018e8aed52706f9;hp=c53712a27748834f97082401abecb1e2198f9535;hb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;hpb=e7c43073246afe07cddf67d40d545f2bebcf62a1 diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index c53712a..bb351fe 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -60,11 +60,6 @@ void init_taskbar() for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; - if (panel->taskbar) { - free(panel->taskbar); - panel->taskbar = 0; - } - if (panel->g_taskbar.bg == 0) { panel->g_taskbar.bg = &g_array_index(backgrounds, Background, 0); panel->g_taskbar.area.bg = panel->g_taskbar.bg; @@ -159,17 +154,12 @@ void init_taskbar() //printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width); Taskbar *tskbar; - panel->nb_desktop = server.nb_desktop; - panel->taskbar = calloc(panel->nb_desktop, sizeof(Taskbar)); for (j=0 ; j < panel->nb_desktop ; j++) { tskbar = &panel->taskbar[j]; memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area)); tskbar->desktop = j; if (j == server.desktop && panel->g_taskbar.use_active) tskbar->area.bg = panel->g_taskbar.bg_active; - - // add taskbar to the panel - panel->area.list = g_slist_append(panel->area.list, tskbar); } } }