int j;
if (!taskbarname_enabled) return;
-
- for (j=0 ; j < panel->nb_desktop ; j++) {
+
+ GSList *l, *list = server_get_name_of_desktop();
+ for (j=0, l=list ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
tskbar->bar_name.area.parent = tskbar;
tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
else
tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
- tskbar->bar_name.name = g_strdup_printf("%d", j+1);
+
+ // use desktop number if name is missing
+ if (l) {
+ tskbar->bar_name.name = g_strdup(l->data);
+ l = l->next;
+ }
+ else
+ tskbar->bar_name.name = g_strdup_printf("%d", j+1);
// append the name at the beginning of taskbar
tskbar->area.list = g_slist_append(tskbar->area.list, &tskbar->bar_name);
}
+
+ for (l=list ; l ; l = l->next)
+ g_free(l->data);
+ g_slist_free(list);
}
return ret;
}
-
-
-