aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorakir <akir>2004-08-26 18:26:39 (GMT)
committerakir <akir>2004-08-26 18:26:39 (GMT)
commit6ce5a31ea8bb6dbf6f64260c62d9af153e9d7f30 (patch)
treebd4551de51a6c58e9eac351759e488bc74febc8d /src/FbTk
parent0f83e449727a16c178b47262f170e879a22c0981 (diff)
downloadfluxbox-6ce5a31ea8bb6dbf6f64260c62d9af153e9d7f30.zip
fluxbox-6ce5a31ea8bb6dbf6f64260c62d9af153e9d7f30.tar.bz2
unification for themes.cfg/styles.cfg and the same for menuentries:
[stylesmenu] and [themesmenu] [stylesdir] and [themesdir]
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Theme.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 066f9fa..e557d29 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Theme.cc,v 1.27 2004/06/07 11:46:05 rathnor Exp $ 22// $Id: Theme.cc,v 1.28 2004/08/26 18:26:39 akir Exp $
23 23
24#include "Theme.hh" 24#include "Theme.hh"
25 25
@@ -88,8 +88,12 @@ bool ThemeManager::load(const std::string &filename, int screen_num) {
88 88
89 location.append("/theme.cfg"); 89 location.append("/theme.cfg");
90 if (!Directory::isRegularFile(location)) { 90 if (!Directory::isRegularFile(location)) {
91 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl; 91 location = prefix;
92 return false; 92 location.append("/style.cfg");
93 if (!Directory::isRegularFile(location)) {
94 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
95 return false;
96 }
93 } 97 }
94 } else { 98 } else {
95 // dirname 99 // dirname