rmove old convert.awk

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index ecf69651665c488ea929eedbc1d4d3211798edb3..63e0ef0536676703ed1b14d1cd16913c46361559 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -96,21 +96,20 @@ extern "C" {
 #include <string>
 using std::string;
 
-#include "i18n.hh"
 #include "blackbox.hh"
-#include "Basemenu.hh"
-#include "Clientmenu.hh"
-#include "GCCache.hh"
-#include "Image.hh"
-#include "Rootmenu.hh"
-#include "Screen.hh"
-#include "Slit.hh"
-#include "Toolbar.hh"
-#include "Util.hh"
-#include "Window.hh"
-#include "Workspace.hh"
-#include "Workspacemenu.hh"
-#include "XAtom.hh"
+#include "basemenu.hh"
+#include "clientmenu.hh"
+#include "gccache.hh"
+#include "image.hh"
+#include "rootmenu.hh"
+#include "screen.hh"
+#include "slit.hh"
+#include "toolbar.hh"
+#include "util.hh"
+#include "window.hh"
+#include "workspace.hh"
+#include "workspacemenu.hh"
+#include "xatom.hh"
 
 Blackbox *blackbox;
 
@@ -134,8 +133,17 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   if (! rc) rc = "~/.openbox/rc";
   rc_file = expandTilde(rc);
   config.setFile(rc_file);  
-  if (! menu) menu = "~/.openbox/menu";
-  menu_file = expandTilde(menu);
+
+  string rcmenu;
+  if (! menu) {
+    //have to come up with something better than this
+    config.load();
+    if (! config.getValue("session.menuFile", rcmenu))
+      rcmenu = "~/.openbox/menu";
+  } else {
+    rcmenu = menu;
+  }
+  menu_file = expandTilde(rcmenu.c_str());
 
   no_focus = False;