aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-03 15:51:51 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:21 (GMT)
commit2c38dd03801be6ef071f6e051509907528ed8fbf (patch)
tree38a59606bbe1d6361386c6a24515e632009a1185
parentbb550396f371d5354a5659c853bb4e6b46f8e913 (diff)
downloadfluxbox_pavel-2c38dd03801be6ef071f6e051509907528ed8fbf.zip
fluxbox_pavel-2c38dd03801be6ef071f6e051509907528ed8fbf.tar.bz2
Fix a bug in the default root menu
-rw-r--r--src/Screen.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 55b74bc..215d48b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1381,13 +1381,17 @@ void BScreen::rereadMenu() {
1381 1381
1382 if (m_rootmenu->numberOfItems() == 0) { 1382 if (m_rootmenu->numberOfItems() == 0) {
1383 _FB_USES_NLS; 1383 _FB_USES_NLS;
1384 typedef FbTk::RefCount<FbTk::Command<void> > RefCmd;
1385 const FbTk::CommandParser<void> &parser = FbTk::CommandParser<void>::instance();
1386
1384 m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")); 1387 m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"));
1385 FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); 1388 RefCmd execute_xterm(parser.parse("exec", "xterm"));
1386 FbTk::RefCount<FbTk::Command<void> > exit_fb(FbTk::CommandParser<void>::instance().parse("exit")); 1389 RefCmd reconfigure_fb(parser.parse("reconfigure"));
1387 FbTk::RefCount<FbTk::Command<void> > execute_xterm(FbTk::CommandParser<void>::instance().parse("exec xterm")); 1390 RefCmd restart_fb(parser.parse("restart"));
1391 RefCmd exit_fb(parser.parse("exit"));
1388 m_rootmenu->insert("xterm", execute_xterm); 1392 m_rootmenu->insert("xterm", execute_xterm);
1389 m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure", 1393 m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure",
1390 "Reload Configuration command")), 1394 "Reload Configuration command"), reconfigure_fb);
1391 m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"), 1395 m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"),
1392 restart_fb); 1396 restart_fb);
1393 m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), 1397 m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"),