move the move/resize functionality into moveresize.c, for use with the netwm atoms...

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index b30c44d094b02cd2afc9e7abf56fcf6d2cbb7e42..ffb9894f0b14b5355c53e8201d9bf47ff8caa6c7 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -25,7 +25,7 @@ guint    screen_desktop         = 0;
 Size     screen_physical_size;
 gboolean screen_showing_desktop;
 DesktopLayout screen_desktop_layout;
-char   **screen_desktop_names;
+char   **screen_desktop_names = NULL;
 
 static Rect  *area = NULL;
 static Strut *strut = NULL;
@@ -155,10 +155,11 @@ void screen_startup()
     screen_resize();
 
     /* set the names */
-    screen_desktop_names = g_new0(char*,
-                                  g_slist_length(config_desktops_names) + 1);
+    screen_desktop_names = g_new(char*,
+                                 g_slist_length(config_desktops_names) + 1);
     for (i = 0, it = config_desktops_names; it; ++i, it = it->next)
         screen_desktop_names[i] = it->data; /* dont strdup */
+    screen_desktop_names[i] = NULL;
     PROP_SETSS(ob_root, net_desktop_names, screen_desktop_names);
     g_free(screen_desktop_names); /* dont free the individual strings */
     screen_desktop_names = NULL;
@@ -377,11 +378,13 @@ void screen_update_desktop_names()
 
     /* empty the array */
     g_strfreev(screen_desktop_names);
+    screen_desktop_names = NULL;
 
-    PROP_GETSS(ob_root, net_desktop_names, utf8, &screen_desktop_names);
-
-    for (i = 0; screen_desktop_names[i] && i < screen_num_desktops; ++i);
-    if (i < screen_num_desktops) {
+    if (PROP_GETSS(ob_root, net_desktop_names, utf8, &screen_desktop_names))
+        for (i = 0; screen_desktop_names[i] && i <= screen_num_desktops; ++i);
+    else
+        i = 0;
+    if (i <= screen_num_desktops) {
         screen_desktop_names = g_renew(char*, screen_desktop_names,
                                        screen_num_desktops + 1);
         screen_desktop_names[screen_num_desktops] = NULL;