Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 16 insertions, 4 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index b64a95d..fb1b832 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -39,15 +39,24 @@
 
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+
 #include <iostream>
 #include <algorithm>
 #include <new>
+
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
   #include <string.h>
 #endif
 
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
+
 using std::cerr;
 using std::endl;
 using std::vector;
@@ -288,7 +297,7 @@ void extractNetWmIcon(Atom net_wm_icon, WinClient& winclient) {
     winclient.setIcon(icon);
 }
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 class Ewmh::EwmhAtoms {
 public:
@@ -822,7 +831,7 @@ void Ewmh::updateWorkspaceNames(BScreen &screen) {
     const BScreen::WorkspaceNames &workspacenames = screen.getWorkspaceNames();
     const size_t number_of_desks = workspacenames.size();
 
-    char *names[number_of_desks];
+    char** names = new char*[number_of_desks];
 
     for (size_t i = 0; i < number_of_desks; i++) {
         names[i] = new char[workspacenames[i].size() + 1]; // +1 for \0
@@ -844,13 +853,15 @@ void Ewmh::updateWorkspaceNames(BScreen &screen) {
 #else
     if (XStringListToTextProperty(names, number_of_desks, &text)) {
         XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
-                         &text, m_net->desktop_names);
+                &text, m_net->desktop_names);
         XFree(text.value);
     }
 #endif
 
     for (size_t i = 0; i < number_of_desks; i++)
-        delete [] names[i];
+        delete[] names[i];
+
+    delete[] names;
 
 }
 
@@ -1535,3 +1546,4 @@ void Ewmh::updateFrameExtents(FluxboxWindow &win) {
                               (unsigned char *)extents, 4);
     }
 }
+