aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-02-20 09:29:07 (GMT)
committerfluxgen <fluxgen>2004-02-20 09:29:07 (GMT)
commit6b3a626cbef1f50696c15937f77735ed1c916eb3 (patch)
treefa43ca4e303c3392e8b53316fde2e95e6d959188 /src/fluxbox.cc
parent3c78d753c0c1b293d20ad52e38586929bf47f13e (diff)
downloadfluxbox_pavel-6b3a626cbef1f50696c15937f77735ed1c916eb3.zip
fluxbox_pavel-6b3a626cbef1f50696c15937f77735ed1c916eb3.tar.bz2
filename fix, patch from Mathias Gumz
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index b45408a..b2a1dbb 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.230 2004/02/10 18:51:08 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.231 2004/02/20 09:29:05 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -569,7 +569,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
569 } 569 }
570 570
571 // setup theme manager to have our style file ready to be scanned 571 // setup theme manager to have our style file ready to be scanned
572 FbTk::ThemeManager::instance().load(getStyleFilename()); 572 FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename()));
573 573
574 XSynchronize(disp, False); 574 XSynchronize(disp, False);
575 sync(false); 575 sync(false);
@@ -1642,16 +1642,7 @@ void Fluxbox::load_rc() {
1642 1642
1643 if (m_rc_stylefile->empty()) 1643 if (m_rc_stylefile->empty())
1644 *m_rc_stylefile = DEFAULTSTYLE; 1644 *m_rc_stylefile = DEFAULTSTYLE;
1645 else // expand tilde
1646 *m_rc_stylefile = StringUtil::expandFilename(*m_rc_stylefile);
1647
1648
1649 // expand tilde
1650 *m_rc_groupfile = StringUtil::expandFilename(*m_rc_groupfile);
1651 1645
1652#ifdef DEBUG
1653 cerr<<__FILE__<<": Loading groups ("<<*m_rc_groupfile<<")"<<endl;
1654#endif // DEBUG
1655 if (!Workspace::loadGroups(*m_rc_groupfile)) { 1646 if (!Workspace::loadGroups(*m_rc_groupfile)) {
1656 cerr<<"Failed to load groupfile: "<<*m_rc_groupfile<<endl; 1647 cerr<<"Failed to load groupfile: "<<*m_rc_groupfile<<endl;
1657 } 1648 }