X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=a422563d72d9e9cb504816598349be50ca9e5241;hb=83bfa01b0bf361d4a2354e5ef0f48ed759e0eab3;hp=3bab740af93c3f78dd70dfe321755d6084eb2459;hpb=f25252a4849ab205856629480178946b2b454aa3;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index 3bab740a..a422563d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 /*! @file main.cc
   @brief Main entry point for the application
@@ -9,26 +9,27 @@
 #endif // HAVE_CONFIG_H
 
 extern "C" {
+#ifdef    HAVE_LOCALE_H
+# include <locale.h>
+#endif // HAVE_LOCALE_H
+
+#ifdef    HAVE_STDIO_H
+# include <stdio.h>
+#endif // HAVE_STDIO_H
+
 #include "gettext.h"
 }
 
-#include <string>
-using std::string;
-
-#include "blackbox.hh"
 #include "openbox.hh"
 
 int main(int argc, char **argv) {
   // initialize the locale
-  setlocale(LC_ALL, "");
+  if (!setlocale(LC_ALL, ""))
+    printf("Couldn't set locale from environment.\n");
   bindtextdomain(PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset(PACKAGE, "UTF-8");
   textdomain(PACKAGE);
 
-  //ob::Openbox openbox(argc, argv);
-  ob::Blackbox blackbox(argc, argv, 0);
-  
-  //Blackbox blackbox(argv, session_display, rc_file);
-  blackbox.eventLoop();
-
-  return(0);
+  ob::Openbox openbox(argc, argv);
+  openbox.eventLoop();
 }