include the right header and cast to avoid warnings

[chaz/openbox] / util / epist / keytree.cc

diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc
index 2649740ed3744350470db2daffd5a000995ecb25..cf0dd379ea148be1faca259b1b3834683efa8e94 100644 (file)
--- a/util/epist/keytree.cc
+++ b/util/epist/keytree.cc
@@ -22,6 +22,11 @@
 
 #include "keytree.hh"
 
+#include <string>
+
+using std::string;
+
+
 keytree::keytree(Display *display) : _display(display)
 {
   _head = new keynode;
@@ -83,8 +88,6 @@ const Action * keytree::getAction(const XEvent &e, unsigned int state,
     act = (*it)->action;
     if (e.xkey.keycode == act->keycode() && state == act->modifierMask()) {
       if ( isLeaf(*it) ) {
-       if (_current != _head)
-         ungrabChildren(_current, scr);
        _current = _head;
        return act;
       }