diff options
-rw-r--r-- | src/main.cc | 12 |
1 files 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 { | |||
246 | #endif | 246 | #endif |
247 | if (env && strlen(env) > 0) { | 247 | if (env && strlen(env) > 0) { |
248 | rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); | 248 | rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); |
249 | rc_file = rc_path + "/init"; | 249 | rc_file = rc_path + "/init2"; |
250 | } | 250 | } |
251 | } | 251 | } |
252 | 252 | ||
@@ -411,7 +411,7 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) { | |||
411 | // configs might be out of date, so run fluxbox-update_configs | 411 | // configs might be out of date, so run fluxbox-update_configs |
412 | // if necassary. | 412 | // if necassary. |
413 | void updateConfigFilesIfNeeded(const std::string& rc_file) { | 413 | void updateConfigFilesIfNeeded(const std::string& rc_file) { |
414 | 414 | /* XXX | |
415 | const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' | 415 | const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' |
416 | 416 | ||
417 | FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false); | 417 | FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false); |
@@ -444,7 +444,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) { | |||
444 | #ifdef HAVE_SYNC | 444 | #ifdef HAVE_SYNC |
445 | sync(); | 445 | sync(); |
446 | #endif // HAVE_SYNC | 446 | #endif // HAVE_SYNC |
447 | } | 447 | }*/ |
448 | } | 448 | } |
449 | 449 | ||
450 | #include "WinButton.hh" | 450 | #include "WinButton.hh" |
@@ -490,7 +490,7 @@ int main(int argc, char **argv) { | |||
490 | updateConfigFilesIfNeeded(opts.rc_file); | 490 | updateConfigFilesIfNeeded(opts.rc_file); |
491 | 491 | ||
492 | auto_ptr<Fluxbox> fluxbox; | 492 | auto_ptr<Fluxbox> fluxbox; |
493 | try { | 493 | // try { |
494 | 494 | ||
495 | fluxbox.reset(new Fluxbox(argc, argv, | 495 | fluxbox.reset(new Fluxbox(argc, argv, |
496 | opts.session_display, | 496 | opts.session_display, |
@@ -501,7 +501,7 @@ int main(int argc, char **argv) { | |||
501 | 501 | ||
502 | exitcode = EXIT_SUCCESS; | 502 | exitcode = EXIT_SUCCESS; |
503 | 503 | ||
504 | } catch (out_of_range &oor) { | 504 | /* } catch (out_of_range &oor) { |
505 | cerr <<"Fluxbox: " | 505 | cerr <<"Fluxbox: " |
506 | << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message") | 506 | << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message") |
507 | << ": " | 507 | << ": " |
@@ -535,7 +535,7 @@ int main(int argc, char **argv) { | |||
535 | << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message") | 535 | << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message") |
536 | << "." << endl; | 536 | << "." << endl; |
537 | abort(); | 537 | abort(); |
538 | } | 538 | }*/ |
539 | 539 | ||
540 | bool restarting = false; | 540 | bool restarting = false; |
541 | string restart_argument; | 541 | string restart_argument; |