diff options
Diffstat (limited to 'src/Remember.cc')
-rw-r--r-- | src/Remember.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Remember.cc b/src/Remember.cc index f2499df..8e030db 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -21,7 +21,7 @@ | |||
21 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | // DEALINGS IN THE SOFTWARE. | 22 | // DEALINGS IN THE SOFTWARE. |
23 | 23 | ||
24 | // $Id: Remember.cc,v 1.18 2003/05/26 11:27:31 rathnor Exp $ | 24 | // $Id: Remember.cc,v 1.19 2003/05/27 11:55:23 rathnor Exp $ |
25 | 25 | ||
26 | #include "Remember.hh" | 26 | #include "Remember.hh" |
27 | #include "StringUtil.hh" | 27 | #include "StringUtil.hh" |
@@ -32,10 +32,6 @@ | |||
32 | #include "MenuItem.hh" | 32 | #include "MenuItem.hh" |
33 | #include "App.hh" | 33 | #include "App.hh" |
34 | 34 | ||
35 | // TODO get rid of these | ||
36 | #define RC_PATH "fluxbox" | ||
37 | #define RC_INIT_FILE "init" | ||
38 | |||
39 | #include <X11/Xlib.h> | 35 | #include <X11/Xlib.h> |
40 | 36 | ||
41 | //use GNU extensions | 37 | //use GNU extensions |
@@ -301,7 +297,9 @@ int Remember::parseApp(ifstream &file, Application &app) { | |||
301 | 297 | ||
302 | void Remember::load() { | 298 | void Remember::load() { |
303 | 299 | ||
304 | string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps"; | 300 | string apps_string; |
301 | Fluxbox::instance()->getDefaultDataFilename("apps", apps_string); | ||
302 | |||
305 | #ifdef DEBUG | 303 | #ifdef DEBUG |
306 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl; | 304 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl; |
307 | #endif // DEBUG | 305 | #endif // DEBUG |
@@ -356,7 +354,8 @@ void Remember::save() { | |||
356 | #ifdef DEBUG | 354 | #ifdef DEBUG |
357 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): Saving apps file..."<<endl; | 355 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): Saving apps file..."<<endl; |
358 | #endif // DEBUG | 356 | #endif // DEBUG |
359 | string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps"; | 357 | string apps_string; |
358 | Fluxbox::instance()->getDefaultDataFilename("apps", apps_string); | ||
360 | ofstream apps_file(apps_string.c_str()); | 359 | ofstream apps_file(apps_string.c_str()); |
361 | Apps::iterator it = apps.begin(); | 360 | Apps::iterator it = apps.begin(); |
362 | Apps::iterator it_end = apps.end(); | 361 | Apps::iterator it_end = apps.end(); |