diff options
Diffstat (limited to 'src/FbTk/Theme.cc')
-rw-r--r-- | src/FbTk/Theme.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc index 40c68e9..5225686 100644 --- a/src/FbTk/Theme.cc +++ b/src/FbTk/Theme.cc | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "XrmDatabaseHelper.hh" | 26 | #include "XrmDatabaseHelper.hh" |
27 | #include "App.hh" | 27 | #include "App.hh" |
28 | #include "StringUtil.hh" | 28 | #include "StringUtil.hh" |
29 | #include "Directory.hh" | 29 | #include "FileUtil.hh" |
30 | #include "I18n.hh" | 30 | #include "I18n.hh" |
31 | #include "Image.hh" | 31 | #include "Image.hh" |
32 | 32 | ||
@@ -87,14 +87,14 @@ bool ThemeManager::load(const std::string &filename, int screen_num) { | |||
87 | std::string location = FbTk::StringUtil::expandFilename(filename); | 87 | std::string location = FbTk::StringUtil::expandFilename(filename); |
88 | std::string prefix = ""; | 88 | std::string prefix = ""; |
89 | 89 | ||
90 | if (Directory::isDirectory(filename)) { | 90 | if (FileUtil::isDirectory(filename.c_str())) { |
91 | prefix = location; | 91 | prefix = location; |
92 | 92 | ||
93 | location.append("/theme.cfg"); | 93 | location.append("/theme.cfg"); |
94 | if (!Directory::isRegularFile(location)) { | 94 | if (!FileUtil::isRegularFile(location.c_str())) { |
95 | location = prefix; | 95 | location = prefix; |
96 | location.append("/style.cfg"); | 96 | location.append("/style.cfg"); |
97 | if (!Directory::isRegularFile(location)) { | 97 | if (!FileUtil::isRegularFile(location.c_str())) { |
98 | cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl; | 98 | cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl; |
99 | return false; | 99 | return false; |
100 | } | 100 | } |