aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-03-03 12:53:06 (GMT)
committerrathnor <rathnor>2004-03-03 12:53:06 (GMT)
commitc0325e612783dfeb2d032a5dc69339dbbb2772c9 (patch)
tree3ea692788e5dd237dac6c12efc6162ab1c22cab5
parentf9fbd86c75181e6701bd93e174773a98b391382c (diff)
downloadfluxbox_paul-c0325e612783dfeb2d032a5dc69339dbbb2772c9.zip
fluxbox_paul-c0325e612783dfeb2d032a5dc69339dbbb2772c9.tar.bz2
fix update of keys on kepmapping change
-rw-r--r--ChangeLog2
-rw-r--r--src/fluxbox.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c8bac8..7252d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.9: 2Changes for 0.9.9:
3*04/03/03: 3*04/03/03:
4 * Fix update of keys on keymap change (Simon)
5 fluxbox.cc
4 * Fix outline moving dropping on source workspace made window 6 * Fix outline moving dropping on source workspace made window
5 disappear [we now explicitly don't unfocus a moving window] (Simon) 7 disappear [we now explicitly don't unfocus a moving window] (Simon)
6 Window.cc fluxbox.cc 8 Window.cc fluxbox.cc
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 119c22c..dd70d6c 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.233 2004/03/03 12:29:31 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.234 2004/03/03 12:53:06 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -875,6 +875,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
875#endif // DEBUG 875#endif // DEBUG
876 876
877 FbTk::KeyUtil::instance().init(); // reinitialise the key utils 877 FbTk::KeyUtil::instance().init(); // reinitialise the key utils
878 // reconfigure keys (if the mapping changes, they don't otherwise update
879 m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str());
878 880
879 break; 881 break;
880 case CreateNotify: 882 case CreateNotify: