aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.cc b/src/main.cc
index 4723c09..6fabf6a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -230,7 +230,7 @@ struct Options {
230 env = getenv("HOME"); 230 env = getenv("HOME");
231 if (env) { 231 if (env) {
232 rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); 232 rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
233 rc_file = rc_path + "/init"; 233 rc_file = rc_path + "/init2";
234 } 234 }
235 } 235 }
236 236
@@ -380,7 +380,7 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) {
380// configs might be out of date, so run fluxbox-update_configs 380// configs might be out of date, so run fluxbox-update_configs
381// if necassary. 381// if necassary.
382void updateConfigFilesIfNeeded(const std::string& rc_file) { 382void updateConfigFilesIfNeeded(const std::string& rc_file) {
383 383/* XXX
384 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h' 384 const int CONFIG_VERSION = 13; // TODO: move this to 'defaults.hh' or 'config.h'
385 385
386 FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false); 386 FbTk::ResourceManager r_mgr("session", "Session", rc_file.c_str(), false);
@@ -410,7 +410,7 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
410 << commandargs 410 << commandargs
411 << "' failed." << endl; 411 << "' failed." << endl;
412 } 412 }
413 } 413 }*/
414} 414}
415 415
416#include "WinButton.hh" 416#include "WinButton.hh"
@@ -469,7 +469,7 @@ int main(int argc, char **argv) {
469 updateConfigFilesIfNeeded(opts.rc_file); 469 updateConfigFilesIfNeeded(opts.rc_file);
470 470
471 auto_ptr<Fluxbox> fluxbox; 471 auto_ptr<Fluxbox> fluxbox;
472 try { 472// try {
473 473
474 fluxbox.reset(new Fluxbox(argc, argv, 474 fluxbox.reset(new Fluxbox(argc, argv,
475 opts.session_display, 475 opts.session_display,
@@ -480,7 +480,7 @@ int main(int argc, char **argv) {
480 480
481 exitcode = EXIT_SUCCESS; 481 exitcode = EXIT_SUCCESS;
482 482
483 } catch (out_of_range &oor) { 483 /* } catch (out_of_range &oor) {
484 cerr <<"Fluxbox: " 484 cerr <<"Fluxbox: "
485 << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message") 485 << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message")
486 << ": " 486 << ": "
@@ -514,7 +514,7 @@ int main(int argc, char **argv) {
514 << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message") 514 << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message")
515 << "." << endl; 515 << "." << endl;
516 abort(); 516 abort();
517 } 517 }*/
518 518
519 bool restarting = false; 519 bool restarting = false;
520 string restart_argument; 520 string restart_argument;