diff options
-rw-r--r-- | src/fluxbox.cc | 10 |
1 files 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 @@ | |||
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.38 2002/03/01 15:28:56 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.39 2002/03/01 16:58:51 fluxgen Exp $ |
26 | 26 | ||
27 | //Use some GNU extensions | 27 | //Use some GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -400,7 +400,9 @@ key(0) | |||
400 | timer->fireOnce(True); | 400 | timer->fireOnce(True); |
401 | 401 | ||
402 | //create keybindings handler and load keys file | 402 | //create keybindings handler and load keys file |
403 | key = new Keys(getXDisplay(), const_cast<char *>((*m_rc_keyfile).c_str())); | 403 | char *keyfilename = StringUtil::expandFilename((*m_rc_keyfile).c_str()); |
404 | key = new Keys(getXDisplay(), const_cast<char *>(keyfilename)); | ||
405 | delete keyfilename; | ||
404 | 406 | ||
405 | ungrab(); | 407 | ungrab(); |
406 | } | 408 | } |
@@ -2363,7 +2365,9 @@ void Fluxbox::real_reconfigure(void) { | |||
2363 | } | 2365 | } |
2364 | 2366 | ||
2365 | //reconfigure keys | 2367 | //reconfigure keys |
2366 | key->reconfigure(const_cast<char *>(m_rc_keyfile->c_str())); | 2368 | char *keyfilename = StringUtil::expandFilename(m_rc_keyfile->c_str()); |
2369 | key->reconfigure(keyfilename); | ||
2370 | delete keyfilename; | ||
2367 | 2371 | ||
2368 | //reconfigure tabs | 2372 | //reconfigure tabs |
2369 | reconfigureTabs(); | 2373 | reconfigureTabs(); |