aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-27 11:55:23 (GMT)
committerrathnor <rathnor>2003-05-27 11:55:23 (GMT)
commitaf543ba9d3b7e8ccf48cd9f5668fef8b5118e7b4 (patch)
treea4959e58f2abcc6a4fa5346ab33ec9edffa6761c /src
parentfc760d0b688ebd2d62cc7bd05df7f4a87ab15677 (diff)
downloadfluxbox_paul-af543ba9d3b7e8ccf48cd9f5668fef8b5118e7b4.zip
fluxbox_paul-af543ba9d3b7e8ccf48cd9f5668fef8b5118e7b4.tar.bz2
remove RC_PATH from remember.cc
Diffstat (limited to 'src')
-rw-r--r--src/Remember.cc13
-rw-r--r--src/fluxbox.hh5
2 files changed, 9 insertions, 9 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
302void Remember::load() { 298void 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();
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 2d03b07..ea4b34f 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.hh,v 1.60 2003/05/18 22:02:55 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.61 2003/05/27 11:55:23 rathnor Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -191,6 +191,8 @@ public:
191 bool menuTimestampsChanged() const; 191 bool menuTimestampsChanged() const;
192 bool haveShape() const { return m_have_shape; } 192 bool haveShape() const { return m_have_shape; }
193 int shapeEventbase() const { return m_shape_eventbase; } 193 int shapeEventbase() const { return m_shape_eventbase; }
194 void getDefaultDataFilename(char *, std::string &);
195
194private: 196private:
195 struct cursor { 197 struct cursor {
196 Cursor session, move, ll_angle, lr_angle; 198 Cursor session, move, ll_angle, lr_angle;
@@ -208,7 +210,6 @@ private:
208 210
209 211
210 std::string getRcFilename(); 212 std::string getRcFilename();
211 void getDefaultDataFilename(char *, std::string &);
212 void load_rc(); 213 void load_rc();
213 214
214 void reload_rc(); 215 void reload_rc();