X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbarname.c;h=12866c7aabb46e1c75b6b553bb03d9e49da588a6;hb=9a6f8801012c62445afd308a733aed5fc3bb7716;hp=ce4d294733adea16d84ea1bfd8db37f4a97d2c4e;hpb=bd230aca5f0289c9464aa98b29f672c28fc58243;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbarname.c b/src/taskbar/taskbarname.c
index ce4d294..12866c7 100644
--- a/src/taskbar/taskbarname.c
+++ b/src/taskbar/taskbarname.c
@@ -53,7 +53,8 @@ void init_taskbarname_panel(void *p)
 	
 	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;
@@ -61,11 +62,22 @@ void init_taskbarname_panel(void *p)
 			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);
 }
 
 
@@ -147,6 +159,3 @@ int resize_taskbarname(void *obj)
 	return ret;
 }
 
-
-
-