diff options
author | markt <markt> | 2007-07-07 04:54:34 (GMT) |
---|---|---|
committer | markt <markt> | 2007-07-07 04:54:34 (GMT) |
commit | b735d405f58ac226e025d6ef4dbd91a0129bb12e (patch) | |
tree | a69c7f72198d02a19c2a577e53102eb4d261c7b1 /util | |
parent | 18cd70f74999b85ea5d35fc95fad3fdf33f1831e (diff) | |
download | fluxbox_paul-b735d405f58ac226e025d6ef4dbd91a0129bb12e.zip fluxbox_paul-b735d405f58ac226e025d6ef4dbd91a0129bb12e.tar.bz2 |
allow negative indices in :Workspace <int>
Diffstat (limited to 'util')
-rw-r--r-- | util/fluxbox-update_configs.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc index de1fbb9..8cfe8ef 100644 --- a/util/fluxbox-update_configs.cc +++ b/util/fluxbox-update_configs.cc | |||
@@ -160,13 +160,15 @@ int main(int argc, char **argv) { | |||
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | if (rc_filename.empty()) | ||
164 | rc_filename = getenv("HOME") + string("/.fluxbox/init"); | ||
165 | |||
163 | FbTk::ResourceManager resource_manager(rc_filename.c_str(),false); | 166 | FbTk::ResourceManager resource_manager(rc_filename.c_str(),false); |
164 | if (rc_filename.empty() || !resource_manager.load(rc_filename.c_str())) { | 167 | if (!resource_manager.load(rc_filename.c_str())) { |
165 | // couldn't load rc file | 168 | // couldn't load rc file |
166 | if (!rc_filename.empty()) { | 169 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<rc_filename<<endl; |
167 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<rc_filename<<endl; | 170 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; |
168 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; | 171 | |
169 | } | ||
170 | // couldn't load default rc file, either | 172 | // couldn't load default rc file, either |
171 | if (!resource_manager.load(DEFAULT_INITFILE)) { | 173 | if (!resource_manager.load(DEFAULT_INITFILE)) { |
172 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; | 174 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; |