From 018599a9fe00cb5a9c1af418dcab3e6c8507e37d Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Fri, 1 Mar 2002 16:58:51 +0000
Subject: expand keyfilename

---
 src/fluxbox.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 66c672e..f7413de 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.38 2002/03/01 15:28:56 fluxgen Exp $
+// $Id: fluxbox.cc,v 1.39 2002/03/01 16:58:51 fluxgen Exp $
 
 //Use some GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -400,7 +400,9 @@ key(0)
 	timer->fireOnce(True);
 
 	//create keybindings handler and load keys file
-	key = new Keys(getXDisplay(), const_cast<char *>((*m_rc_keyfile).c_str()));
+	char *keyfilename = StringUtil::expandFilename((*m_rc_keyfile).c_str());
+	key = new Keys(getXDisplay(), const_cast<char *>(keyfilename));
+	delete keyfilename;
 
 	ungrab();
 }
@@ -2363,7 +2365,9 @@ void Fluxbox::real_reconfigure(void) {
 	}
 	
 	//reconfigure keys
-	key->reconfigure(const_cast<char *>(m_rc_keyfile->c_str()));
+	char *keyfilename = StringUtil::expandFilename(m_rc_keyfile->c_str());	
+	key->reconfigure(keyfilename);
+	delete keyfilename;
 
 	//reconfigure tabs
 	reconfigureTabs();
-- 
cgit v0.11.2