fix \'s

[chaz/openbox] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 5d878d79c7f0053e6d9425c55240d4e523dd6b0b..a8312af5574dc43181ca6b4d5f6825dfee9be7c0 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -13,32 +13,20 @@ extern "C" {
 # include <locale.h>
 #endif // HAVE_LOCALE_H
 
-#include <guile/gh.h>
-
 #include "gettext.h"
 }
 
 #include <string>
 using std::string;
 
-#include "blackbox.hh"
 #include "openbox.hh"
 
-void main_prog(int argc, char **argv) {
-  ob::Openbox openbox(argc, argv);
-  //ob::Blackbox blackbox(argc, argv, 0);
-
-  //Blackbox blackbox(argv, session_display, rc_file);
-  openbox.eventLoop();
-}
-
 int main(int argc, char **argv) {
   // initialize the locale
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
-  // start up guile
-  //gh_enter(argc, argv, main_prog);
-  main_prog(argc, argv);
+  ob::Openbox openbox(argc, argv);
+  openbox.eventLoop();
 }