*fix* battery: set background_id to 0 if none has been specified

[chaz/tint2] / src / taskbar / taskbarname.c

diff --git a/src/taskbar/taskbarname.c b/src/taskbar/taskbarname.c
index ce4d294733adea16d84ea1bfd8db37f4a97d2c4e..4f8d19f7de5ecdca0d34674293944de9a1b03e03 100644 (file)
--- a/src/taskbar/taskbarname.c
+++ b/src/taskbar/taskbarname.c
@@ -52,8 +52,9 @@ void init_taskbarname_panel(void *p)
        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;
@@ -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;
 }
 
-
-
-