typo.. just PACKAGE

[chaz/openbox] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 3bab740af93c3f78dd70dfe321755d6084eb2459..a43d21b11acc192c1b355c7a5c108ca255fdb88e 100644 (file)
--- 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,22 @@
 #endif // HAVE_CONFIG_H
 
 extern "C" {
+#ifdef    HAVE_LOCALE_H
+# include <locale.h>
+#endif // HAVE_LOCALE_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, "");
   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();
 }