summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Remember.cc5
-rw-r--r--src/fluxbox.cc3
-rw-r--r--src/fluxbox.hh5
3 files changed, 7 insertions, 6 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index 27a8da2..f40071b 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.42 2004/09/04 04:54:38 akir Exp $ 24// $Id: Remember.cc,v 1.43 2004/10/19 09:01:49 akir Exp $
25 25
26#include "Remember.hh" 26#include "Remember.hh"
27#include "ClientPattern.hh" 27#include "ClientPattern.hh"
@@ -445,8 +445,7 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
445 445
446void Remember::load() { 446void Remember::load() {
447 447
448 string apps_string; 448 string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename());
449 Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
450 449
451#ifdef DEBUG 450#ifdef DEBUG
452 cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl; 451 cerr<<__FILE__<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index cfceaf7..c217a40 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -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.cc,v 1.259 2004/10/18 01:26:54 akir Exp $ 25// $Id: fluxbox.cc,v 1.260 2004/10/19 09:01:49 akir Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -218,6 +218,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
218 m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), 218 m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
219 m_rc_slitlistfile(m_resourcemanager, "", "session.slitlistFile", "Session.SlitlistFile"), 219 m_rc_slitlistfile(m_resourcemanager, "", "session.slitlistFile", "Session.SlitlistFile"),
220 m_rc_groupfile(m_resourcemanager, "", "session.groupFile", "Session.GroupFile"), 220 m_rc_groupfile(m_resourcemanager, "", "session.groupFile", "Session.GroupFile"),
221 m_rc_appsfile(m_resourcemanager, "", "session.appsFile", "Session.AppsFile"),
221 m_rc_titlebar_left(m_resourcemanager, 222 m_rc_titlebar_left(m_resourcemanager,
222 TitlebarList(&s_titlebar_left[0], &s_titlebar_left[1]), 223 TitlebarList(&s_titlebar_left[0], &s_titlebar_left[1]),
223 "session.titlebar.left", "Session.Titlebar.Left"), 224 "session.titlebar.left", "Session.Titlebar.Left"),
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 021619b..ff817d1 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.93 2004/10/18 01:26:54 akir Exp $ 25// $Id: fluxbox.hh,v 1.94 2004/10/19 09:01:49 akir Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -124,6 +124,7 @@ public:
124 124
125 inline const std::string &getMenuFilename() const { return *m_rc_menufile; } 125 inline const std::string &getMenuFilename() const { return *m_rc_menufile; }
126 inline const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; } 126 inline const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; }
127 inline const std::string &getAppsFilename() const { return *m_rc_appsfile; }
127 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; } 128 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; }
128 inline int getNumberOfLayers() const { return *m_rc_numlayers; } 129 inline int getNumberOfLayers() const { return *m_rc_numlayers; }
129 inline int getTabsPadding() const { return *m_rc_tabs_padding; } 130 inline int getTabsPadding() const { return *m_rc_tabs_padding; }
@@ -264,7 +265,7 @@ private:
264 m_rc_focused_tab_min_width; 265 m_rc_focused_tab_min_width;
265 FbTk::Resource<std::string> m_rc_stylefile, 266 FbTk::Resource<std::string> m_rc_stylefile,
266 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 267 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
267 m_rc_groupfile; 268 m_rc_groupfile, m_rc_appsfile;
268 269
269 270
270 FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; 271 FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;