From: Dana Jansens <danakj@orodu.net>
Date: Wed, 23 May 2007 03:16:45 +0000 (+0000)
Subject: set the desktop names when there are too few from the config file when possible.... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1cafe0ba4c11baf1f2214c10c1e00ea930d63adc;p=chaz%2Fopenbox

set the desktop names when there are too few from the config file when possible. otherwise use "desktop %d".

if we change the desktop names at all, set the root hint so other apps know about it too and we can all agree
---

diff --git a/openbox/screen.c b/openbox/screen.c
index c92aee18..b9cbdd2c 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -900,11 +900,28 @@ void screen_update_desktop_names()
     else
         i = 0;
     if (i < screen_num_desktops) {
+        GSList *it;
+
         screen_desktop_names = g_renew(gchar*, screen_desktop_names,
                                        screen_num_desktops + 1);
         screen_desktop_names[screen_num_desktops] = NULL;
-        for (; i < screen_num_desktops; ++i)
-            screen_desktop_names[i] = g_strdup_printf("desktop %i", i + 1);
+
+        it = g_slist_nth(config_desktops_names, i);
+
+        for (; i < screen_num_desktops; ++i) {
+            if (it)
+                /* use the names from the config file when possible */
+                screen_desktop_names[i] = g_strdup(it->data);
+            else
+                /* make up a nice name if it's not though */
+                screen_desktop_names[i] = g_strdup_printf("desktop %i", i + 1);
+            if (it) it = g_slist_next(it);
+        }
+
+        /* if we changed any names, then set the root property so we can
+           all agree on the names */
+        PROP_SETSS(RootWindow(ob_display, ob_screen), net_desktop_names,
+                   screen_desktop_names);
     }
 
     /* resize the pager for these names */