aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authormarkt <markt>2007-03-29 19:19:26 (GMT)
committermarkt <markt>2007-03-29 19:19:26 (GMT)
commit2b83355eef4b473b586bd48cca5816598e0d2be2 (patch)
tree5775134ace27e4f35274a3e32103f55d5b73a34f /src/FbTk
parent9ca59a0ee2ccd59903d42239dab6de1666e390b2 (diff)
downloadfluxbox-2b83355eef4b473b586bd48cca5816598e0d2be2.zip
fluxbox-2b83355eef4b473b586bd48cca5816598e0d2be2.tar.bz2
removed groups file, fixed initial_state handling
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Resource.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index 5d2dc3b..cb45eac 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -24,6 +24,7 @@
24#include "XrmDatabaseHelper.hh" 24#include "XrmDatabaseHelper.hh"
25#include "Resource.hh" 25#include "Resource.hh"
26#include "I18n.hh" 26#include "I18n.hh"
27#include "StringUtil.hh"
27 28
28#include <iostream> 29#include <iostream>
29#ifdef HAVE_CASSERT 30#ifdef HAVE_CASSERT
@@ -61,7 +62,7 @@ bool ResourceManager::m_init = false;
61 @return true on success else false 62 @return true on success else false
62*/ 63*/
63bool ResourceManager::load(const char *filename) { 64bool ResourceManager::load(const char *filename) {
64 m_filename = filename; 65 m_filename = StringUtil::expandFilename(filename).c_str();
65 66
66 // force reload (lock will ensure it exists) 67 // force reload (lock will ensure it exists)
67 if (m_database) { 68 if (m_database) {
@@ -106,6 +107,7 @@ bool ResourceManager::load(const char *filename) {
106*/ 107*/
107bool ResourceManager::save(const char *filename, const char *mergefilename) { 108bool ResourceManager::save(const char *filename, const char *mergefilename) {
108 assert(filename); 109 assert(filename);
110 filename = StringUtil::expandFilename(filename).c_str();
109 111
110 // empty database 112 // empty database
111 XrmDatabaseHelper database; 113 XrmDatabaseHelper database;