nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove RC_PATH from remember.cc

Browse source
This commit is contained in:
rathnor 2003-05-27 11:55:23 +00:00
parent fc760d0b68
commit af543ba9d3
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Remember.cc
View file

@ -21,7 +21,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Remember.cc,v 1.18 2003/05/26 11:27:31 rathnor Exp $ // $Id: Remember.cc,v 1.19 2003/05/27 11:55:23 rathnor Exp $
#include "Remember.hh" #include "Remember.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
@ -32,10 +32,6 @@
#include "MenuItem.hh" #include "MenuItem.hh"
#include "App.hh" #include "App.hh"
// TODO get rid of these
#define RC_PATH "fluxbox"
#define RC_INIT_FILE "init"
#include <X11/Xlib.h> #include <X11/Xlib.h>
//use GNU extensions //use GNU extensions
@ -301,7 +297,9 @@ int Remember::parseApp(ifstream &file, Application &app) {
void Remember::load() { void Remember::load() {
string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps"; string apps_string;
Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl;
#endif // DEBUG #endif // DEBUG
@ -356,7 +354,8 @@ void Remember::save() {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<"): Saving apps file..."<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): Saving apps file..."<<endl;
#endif // DEBUG #endif // DEBUG
string apps_string = getenv("HOME")+string("/.")+RC_PATH+string("/")+"apps"; string apps_string;
Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
ofstream apps_file(apps_string.c_str()); ofstream apps_file(apps_string.c_str());
Apps::iterator it = apps.begin(); Apps::iterator it = apps.begin();
Apps::iterator it_end = apps.end(); Apps::iterator it_end = apps.end();

5
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.hh,v 1.60 2003/05/18 22:02:55 fluxgen Exp $ // $Id: fluxbox.hh,v 1.61 2003/05/27 11:55:23 rathnor Exp $
#ifndef FLUXBOX_HH #ifndef FLUXBOX_HH
#define FLUXBOX_HH #define FLUXBOX_HH
@ -191,6 +191,8 @@ public:
bool menuTimestampsChanged() const; bool menuTimestampsChanged() const;
bool haveShape() const { return m_have_shape; } bool haveShape() const { return m_have_shape; }
int shapeEventbase() const { return m_shape_eventbase; } int shapeEventbase() const { return m_shape_eventbase; }
void getDefaultDataFilename(char *, std::string &);
private: private:
struct cursor { struct cursor {
Cursor session, move, ll_angle, lr_angle; Cursor session, move, ll_angle, lr_angle;
@ -208,7 +210,6 @@ private:
std::string getRcFilename(); std::string getRcFilename();
void getDefaultDataFilename(char *, std::string &);
void load_rc(); void load_rc();
void reload_rc(); void reload_rc();