aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-10-05 01:49:00 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-10-05 01:49:00 (GMT)
commitab25696328c49b7551ea242b740ff9c79953f722 (patch)
tree007d0a50bea5cecfa571c2767f0861593f6f0faa /src
parent073beb9da5d55a89b0b737e6ba16d922a43b23aa (diff)
downloadfluxbox_pavel-ab25696328c49b7551ea242b740ff9c79953f722.zip
fluxbox_pavel-ab25696328c49b7551ea242b740ff9c79953f722.tar.bz2
remove rootcommand from init file
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc7
-rw-r--r--src/Screen.hh1
2 files changed, 0 insertions, 8 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 96ede24..2a89bad 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -296,7 +296,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
296 auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"), 296 auto_raise(rm, true, scrname+".autoRaise", altscrname+".AutoRaise"),
297 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"), 297 click_raises(rm, true, scrname+".clickRaises", altscrname+".ClickRaises"),
298 default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"), 298 default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
299 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
300 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"), 299 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
301 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"), 300 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"),
302 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"), 301 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"),
@@ -461,12 +460,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
461 imageControl().installRootColormap(); 460 imageControl().installRootColormap();
462 root_colormap_installed = true; 461 root_colormap_installed = true;
463 462
464 // if user specified background in the config then use it
465 if (!resource.rootcommand->empty()) {
466 FbCommands::ExecuteCmd cmd(*resource.rootcommand, screenNumber());
467 cmd.execute();
468 }
469
470 m_root_theme.reset(new RootTheme(imageControl())); 463 m_root_theme.reset(new RootTheme(imageControl()));
471 m_root_theme->reconfigTheme(); 464 m_root_theme->reconfigTheme();
472 465
diff --git a/src/Screen.hh b/src/Screen.hh
index eb86b03..4f36190 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -552,7 +552,6 @@ private:
552 max_ignore_inc, max_disable_move, max_disable_resize, 552 max_ignore_inc, max_disable_move, max_disable_resize,
553 workspace_warping, show_window_pos, auto_raise, click_raises; 553 workspace_warping, show_window_pos, auto_raise, click_raises;
554 FbTk::Resource<std::string> default_deco; 554 FbTk::Resource<std::string> default_deco;
555 FbTk::Resource<std::string> rootcommand;
556 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; 555 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
557 FbTk::Resource<std::string> windowmenufile; 556 FbTk::Resource<std::string> windowmenufile;
558 FbTk::Resource<unsigned int> typing_delay; 557 FbTk::Resource<unsigned int> typing_delay;