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

diff --git a/src/taskbar/taskbarname.c b/src/taskbar/taskbarname.c
index 2cde28b..12866c7 100644
--- a/src/taskbar/taskbarname.c
+++ b/src/taskbar/taskbarname.c
@@ -49,25 +49,11 @@ void init_taskbarname_panel(void *p)
 {
 	Panel *panel =(Panel*)p;
 	Taskbar *tskbar;
-	int j, count;
+	int j;
 	
 	if (!taskbarname_enabled) return;
 	
-	GList *list = NULL;
-	gchar *data_ptr, *ptr;
-	data_ptr = server_get_property (server.root_win, server.atom._NET_DESKTOP_NAMES, server.atom.UTF8_STRING, &count);
-	if (data_ptr) {
-		list = g_list_append(list, g_strdup(data_ptr));
-		for (j = 0; j < count-1; j++) {
-			if (*(data_ptr + j)	== '\0') {
-				ptr = (gchar*)data_ptr + j + 1;
-				list = g_list_append(list, g_strdup(ptr));
-			}
-		}
-		XFree(data_ptr);
-	}
-
-	GList *l;
+	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));
@@ -77,18 +63,21 @@ void init_taskbarname_panel(void *p)
 		else
 			tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
 
+		// use desktop number if name is missing
 		if (l) {
 			tskbar->bar_name.name = g_strdup(l->data);
 			l = l->next;
 		}
-		else {
-			// use desktop number if name is missing
+		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);
 }