aboutsummaryrefslogtreecommitdiff
path: root/src/RootCmdMenuItem.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-07-07 23:11:04 (GMT)
committermarkt <markt>2007-07-07 23:11:04 (GMT)
commit135019abf97c7adb236c061d46e3906e51c8a145 (patch)
tree2e675ac4d9dfda48301e0b2a40b057448174692e /src/RootCmdMenuItem.cc
parentb735d405f58ac226e025d6ef4dbd91a0129bb12e (diff)
downloadfluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.zip
fluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.tar.bz2
fixes for --program-prefix and --program-suffix, plus fixed overwriting init file on reconfigure
Diffstat (limited to 'src/RootCmdMenuItem.cc')
-rw-r--r--src/RootCmdMenuItem.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/RootCmdMenuItem.cc b/src/RootCmdMenuItem.cc
index eabc5d3..a52a4d8 100644
--- a/src/RootCmdMenuItem.cc
+++ b/src/RootCmdMenuItem.cc
@@ -23,6 +23,7 @@
23 23
24#include "RootCmdMenuItem.hh" 24#include "RootCmdMenuItem.hh"
25 25
26#include "defaults.hh"
26#include "FbCommands.hh" 27#include "FbCommands.hh"
27#include "fluxbox.hh" 28#include "fluxbox.hh"
28 29
@@ -33,9 +34,10 @@ RootCmdMenuItem::RootCmdMenuItem(const FbTk::FbString &label,
33 const std::string &cmd): 34 const std::string &cmd):
34 FbTk::MenuItem(label), 35 FbTk::MenuItem(label),
35 m_filename(filename) { 36 m_filename(filename) {
36 37
37 FbTk::RefCount<FbTk::Command> 38 std::string prog = cmd.empty() ? realProgramName("fbsetbg") : cmd;
38 setwp_cmd(new FbCommands::ExecuteCmd(cmd + " \"" + m_filename + "\"")); 39 FbTk::RefCount<FbTk::Command>
40 setwp_cmd(new FbCommands::ExecuteCmd(prog + " \"" + m_filename + "\""));
39 setCommand(setwp_cmd); 41 setCommand(setwp_cmd);
40 setToggleItem(true); 42 setToggleItem(true);
41} 43}