python. no more guile. python.

[chaz/openbox] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 5b6c7885d66a8e15ae1d1bb55aac8acacc5890d9..5d878d79c7f0053e6d9425c55240d4e523dd6b0b 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -13,6 +13,8 @@ extern "C" {
 # include <locale.h>
 #endif // HAVE_LOCALE_H
 
+#include <guile/gh.h>
+
 #include "gettext.h"
 }
 
@@ -22,17 +24,21 @@ 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);
 
-  ob::Openbox openbox(argc, argv);
-  //ob::Blackbox blackbox(argc, argv, 0);
-  
-  //Blackbox blackbox(argv, session_display, rc_file);
-  openbox.eventLoop();
-
-  return(0);
+  // start up guile
+  //gh_enter(argc, argv, main_prog);
+  main_prog(argc, argv);
 }