summaryrefslogtreecommitdiff
path: root/src/RootTheme.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/RootTheme.cc
parentb735d405f58ac226e025d6ef4dbd91a0129bb12e (diff)
downloadfluxbox_lack-135019abf97c7adb236c061d46e3906e51c8a145.zip
fluxbox_lack-135019abf97c7adb236c061d46e3906e51c8a145.tar.bz2
fixes for --program-prefix and --program-suffix, plus fixed overwriting init file on reconfigure
Diffstat (limited to 'src/RootTheme.cc')
-rw-r--r--src/RootTheme.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 5189fbb..90478e3 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -23,6 +23,7 @@
23 23
24#include "RootTheme.hh" 24#include "RootTheme.hh"
25 25
26#include "defaults.hh"
26#include "FbRootWindow.hh" 27#include "FbRootWindow.hh"
27#include "FbCommands.hh" 28#include "FbCommands.hh"
28#include "Screen.hh" 29#include "Screen.hh"
@@ -212,7 +213,8 @@ void RootTheme::reconfigTheme() {
212 options = "-A "; 213 options = "-A ";
213 214
214 // compose wallpaper application "fbsetbg" with argumetns 215 // compose wallpaper application "fbsetbg" with argumetns
215 std::string commandargs = "fbsetbg " + options + filename; 216 std::string commandargs = realProgramName("fbsetbg") + " " + options +
217 filename;
216 218
217 // call command with options 219 // call command with options
218 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 220 FbCommands::ExecuteCmd exec(commandargs, screenNum());
@@ -220,7 +222,8 @@ void RootTheme::reconfigTheme() {
220 222
221 } else if (FbTk::FileUtil::isDirectory(filename.c_str()) && 223 } else if (FbTk::FileUtil::isDirectory(filename.c_str()) &&
222 strstr(m_background->options().c_str(), "random") != 0) { 224 strstr(m_background->options().c_str(), "random") != 0) {
223 std::string commandargs = "fbsetbg -R " + filename; 225 std::string commandargs = realProgramName("fbsetbg") + " -R " +
226 filename;
224 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 227 FbCommands::ExecuteCmd exec(commandargs, screenNum());
225 exec.execute(); 228 exec.execute();
226 } else { 229 } else {
@@ -251,7 +254,7 @@ void RootTheme::reconfigTheme() {
251 options += "-gradient '" + m_background->options() + "'"; 254 options += "-gradient '" + m_background->options() + "'";
252 } 255 }
253 256
254 std::string commandargs = "fbsetroot " + options; 257 std::string commandargs = realProgramName("fbsetroot") + " " + options;
255 258
256 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 259 FbCommands::ExecuteCmd exec(commandargs, screenNum());
257 exec.execute(); 260 exec.execute();