From 2846f984b527ae54f7a7678516787e850566c7c9 Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavelo@centrum.sk>
Date: Thu, 16 Jun 2011 21:02:29 +0200
Subject: Another temporary commit

- comment out automatic upgrading of init file as we don't have that yet and it was causing
  problems
- rename default init file to ~/.fluxbox/init2 to reflect the change of syntax
- comment out exception handling blocks in main(): it is easier to debug when the program
  terminates when an unhandled exception occurs
---
 src/main.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.cc b/src/main.cc
index 6e6e47d..cfc702c 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -246,7 +246,7 @@ struct Options {
 #endif
         if (env && strlen(env) > 0) {
             rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
-            rc_file = rc_path + "/init";
+            rc_file = rc_path + "/init2";
         }
     }
 
@@ -411,7 +411,7 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) {
 // configs might be out of date, so run fluxbox-update_configs
 // if necassary.
 void updateConfigFilesIfNeeded(const std::string& rc_file) {
-
+/* XXX
     const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
 
     FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false);
@@ -444,7 +444,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
 #ifdef HAVE_SYNC
         sync();
 #endif // HAVE_SYNC
-    }
+    }*/
 }
 
 #include "WinButton.hh"
@@ -490,7 +490,7 @@ int main(int argc, char **argv) {
     updateConfigFilesIfNeeded(opts.rc_file);
 
     auto_ptr<Fluxbox> fluxbox;
-    try {
+//    try {
 
         fluxbox.reset(new Fluxbox(argc, argv,
                     opts.session_display,
@@ -501,7 +501,7 @@ int main(int argc, char **argv) {
 
         exitcode = EXIT_SUCCESS;
 
-    } catch (out_of_range &oor) {
+  /*  } catch (out_of_range &oor) {
         cerr <<"Fluxbox: "
             << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message")
             << ": "
@@ -535,7 +535,7 @@ int main(int argc, char **argv) {
             << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message")
             << "." << endl;
         abort();
-    }
+    }*/
 
     bool restarting = false;
     string restart_argument;
-- 
cgit v0.11.2