diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/main.cc b/src/main.cc index 5149615..27b1077 100644 --- a/src/main.cc +++ b/src/main.cc | |||
@@ -416,19 +416,6 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) { | |||
416 | #include "WinButton.hh" | 416 | #include "WinButton.hh" |
417 | int main(int argc, char **argv) { | 417 | int main(int argc, char **argv) { |
418 | 418 | ||
419 | #if 0 | ||
420 | lua::state l; | ||
421 | FbTk::LResourceManager::initState(l); | ||
422 | FbTk::LResourceManager man("session", l); | ||
423 | l.loadstring("session.asdf = {'close', 'close'}; session.q={{1,2,{3,4}},{{z={{5}}}}};"); | ||
424 | l.call(0,0); | ||
425 | man.save("/dev/stdout", NULL); | ||
426 | FbTk::Resource<std::vector<WinButton::Type>, FbTk::VectorTraits<FbTk::EnumTraits<WinButton::Type> > > asdf(man, std::vector<WinButton::Type>(), "asdf", "ASDF"); | ||
427 | cout << "asdf: " << asdf.getString() << endl; | ||
428 | man.save("/dev/stdout", NULL); | ||
429 | return 0; | ||
430 | #endif | ||
431 | |||
432 | FbTk::NLSInit("fluxbox.cat"); | 419 | FbTk::NLSInit("fluxbox.cat"); |
433 | 420 | ||
434 | Options opts; | 421 | Options opts; |
@@ -469,7 +456,7 @@ int main(int argc, char **argv) { | |||
469 | updateConfigFilesIfNeeded(opts.rc_file); | 456 | updateConfigFilesIfNeeded(opts.rc_file); |
470 | 457 | ||
471 | auto_ptr<Fluxbox> fluxbox; | 458 | auto_ptr<Fluxbox> fluxbox; |
472 | // try { | 459 | try { |
473 | 460 | ||
474 | fluxbox.reset(new Fluxbox(argc, argv, | 461 | fluxbox.reset(new Fluxbox(argc, argv, |
475 | opts.session_display, | 462 | opts.session_display, |
@@ -480,7 +467,7 @@ int main(int argc, char **argv) { | |||
480 | 467 | ||
481 | exitcode = EXIT_SUCCESS; | 468 | exitcode = EXIT_SUCCESS; |
482 | 469 | ||
483 | /* } catch (out_of_range &oor) { | 470 | } catch (out_of_range &oor) { |
484 | cerr <<"Fluxbox: " | 471 | cerr <<"Fluxbox: " |
485 | << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message") | 472 | << _FB_CONSOLETEXT(main, ErrorOutOfRange, "Out of range", "Error message") |
486 | << ": " | 473 | << ": " |
@@ -514,7 +501,7 @@ int main(int argc, char **argv) { | |||
514 | << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message") | 501 | << _FB_CONSOLETEXT(main, ErrorUnknown, "Unknown error", "Error message") |
515 | << "." << endl; | 502 | << "." << endl; |
516 | abort(); | 503 | abort(); |
517 | }*/ | 504 | } |
518 | 505 | ||
519 | bool restarting = false; | 506 | bool restarting = false; |
520 | string restart_argument; | 507 | string restart_argument; |