From 3e83f5941f75dd065d3d9f108a6510e5bd9a9266 Mon Sep 17 00:00:00 2001
From: akir <akir>
Date: Tue, 19 Oct 2004 09:01:49 +0000
Subject: added session.appsFile to the ressources

---
 src/Remember.cc | 5 ++---
 src/fluxbox.cc  | 3 ++-
 src/fluxbox.hh  | 5 +++--
 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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Remember.cc,v 1.42 2004/09/04 04:54:38 akir Exp $
+// $Id: Remember.cc,v 1.43 2004/10/19 09:01:49 akir Exp $
 
 #include "Remember.hh"
 #include "ClientPattern.hh"
@@ -445,8 +445,7 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
 
 void Remember::load() {
 
-    string apps_string;
-    Fluxbox::instance()->getDefaultDataFilename("apps", apps_string);
+    string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename());
 
 #ifdef DEBUG
     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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.259 2004/10/18 01:26:54 akir Exp $
+// $Id: fluxbox.cc,v 1.260 2004/10/19 09:01:49 akir Exp $
 
 #include "fluxbox.hh"
 
@@ -218,6 +218,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
       m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
       m_rc_slitlistfile(m_resourcemanager, "", "session.slitlistFile", "Session.SlitlistFile"),
       m_rc_groupfile(m_resourcemanager, "", "session.groupFile", "Session.GroupFile"),
+      m_rc_appsfile(m_resourcemanager, "", "session.appsFile", "Session.AppsFile"),
       m_rc_titlebar_left(m_resourcemanager, 
                          TitlebarList(&s_titlebar_left[0], &s_titlebar_left[1]), 
                          "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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.hh,v 1.93 2004/10/18 01:26:54 akir Exp $
+// $Id: fluxbox.hh,v 1.94 2004/10/19 09:01:49 akir Exp $
 
 #ifndef	 FLUXBOX_HH
 #define	 FLUXBOX_HH
@@ -124,6 +124,7 @@ public:
 
     inline const std::string &getMenuFilename() const { return *m_rc_menufile; }
     inline const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; }
+    inline const std::string &getAppsFilename() const { return *m_rc_appsfile; }
     inline int colorsPerChannel() const { return *m_rc_colors_per_channel; }
     inline int getNumberOfLayers() const { return *m_rc_numlayers; }
     inline int getTabsPadding() const { return *m_rc_tabs_padding; }
@@ -264,7 +265,7 @@ private:
         m_rc_focused_tab_min_width;
     FbTk::Resource<std::string> m_rc_stylefile,
         m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
-        m_rc_groupfile;
+        m_rc_groupfile, m_rc_appsfile;
 
 
     FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
-- 
cgit v0.11.2