aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-19 05:28:22 (GMT)
committersimonb <simonb>2006-04-19 05:28:22 (GMT)
commit759ca9e6b5103c5589d4d5db3883fd34801cb1bf (patch)
tree40474a7274a516ec8e4f89c620b0971e667031d1
parentc92942270aedbac763b98d934dad292f0becd915 (diff)
downloadfluxbox-759ca9e6b5103c5589d4d5db3883fd34801cb1bf.zip
fluxbox-759ca9e6b5103c5589d4d5db3883fd34801cb1bf.tar.bz2
allow ~ in background pixmap path
-rw-r--r--ChangeLog2
-rw-r--r--src/RootTheme.cc1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d3aeba7..fe452ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/19: 3*06/04/19:
4 * Allow ~ in "background" pixmap options (Simon + thanks_markt)
5 RootTheme.cc
4 * Windows keep relative position in ArrangeWindows (Mathias) 6 * Windows keep relative position in ArrangeWindows (Mathias)
5 WorkspaceCmd.cc 7 WorkspaceCmd.cc
6 * Made fbgm more pure bourne-compatibel (Mathias) 8 * Made fbgm more pure bourne-compatibel (Mathias)
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 96f13d5..51885bf 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -175,6 +175,7 @@ void RootTheme::reconfigTheme() {
175 // if background argument is a file then 175 // if background argument is a file then
176 // parse image options and call image setting 176 // parse image options and call image setting
177 // command specified in the resources 177 // command specified in the resources
178 filename = FbTk::StringUtil::expandFilename(filename);
178 if (FbTk::FileUtil::isRegularFile(filename.c_str())) { 179 if (FbTk::FileUtil::isRegularFile(filename.c_str())) {
179 // parse options 180 // parse options
180 std::string options; 181 std::string options;