fixed a memory leak for resource.titlebar_layout

[chaz/openbox] / src / Rootmenu.cc

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index 84ea402b4f1928d89f0c32981bdb6d12117f1d5a..2bda207074bd3fc3d77b1513af6b680206334251 100644 (file)
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -38,10 +38,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -53,7 +56,7 @@
 
 
 Rootmenu::Rootmenu(BScreen &scrn) : Basemenu(scrn), screen(scrn),
-  openbox(*scrn.getOpenbox())
+  openbox(scrn.getOpenbox())
 {
 }
 
@@ -73,7 +76,7 @@ void Rootmenu::itemSelected(int button, int index) {
 #ifndef    __EMX__
       char displaystring[MAXPATHLEN];
       sprintf(displaystring, "DISPLAY=%s",
-             DisplayString(screen.getBaseDisplay()->getXDisplay()));
+             DisplayString(screen.getBaseDisplay().getXDisplay()));
       sprintf(displaystring + strlen(displaystring) - 1, "%d",
              screen.getScreenNumber());
 
@@ -99,7 +102,7 @@ void Rootmenu::itemSelected(int button, int index) {
 
   case BScreen::SetStyle:
     if (item->exec())
-      openbox.saveStyleFilename(item->exec());
+      openbox.setStyleFilename(item->exec());
 
   case BScreen::Reconfigure:
     openbox.reconfigure();