s/reset/resetChains/

diff --git a/src/bindings.cc b/src/bindings.cc
index 9abc33fe24ac0656b686d0f6960d6fdbd43378ea..007b03347561a43a79aca40c26abc09e6e4b42eb 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -339,7 +339,7 @@ void OBBindings::grabKeys(bool grab)
 void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
 {
   if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
 void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
 {
   if (key == _resetkey.key && modifiers == _resetkey.modifiers) {

-    reset(this);
+    resetChains(this);

   } else {
     KeyBindingTree *p = _curpos->first_child;
     while (p) {
   } else {
     KeyBindingTree *p = _curpos->first_child;
     while (p) {


@@ -356,7 +356,7 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
           KeyData *data = new_key_data(win, time, modifiers, key);
           python_callback(p->callback, (PyObject*)data);
           Py_DECREF((PyObject*)data);
           KeyData *data = new_key_data(win, time, modifiers, key);
           python_callback(p->callback, (PyObject*)data);
           Py_DECREF((PyObject*)data);

-          reset(this);
+          resetChains(this);

         }
         break;
       }
         }
         break;
       }


@@ -365,7 +365,7 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
   }
 }
 
   }
 }
 

-void OBBindings::reset(OBBindings *self)
+void OBBindings::resetChains(OBBindings *self)

 {
   self->_timer.stop();
   self->grabKeys(false);
 {
   self->_timer.stop();
   self->grabKeys(false);


@@ -435,7 +435,7 @@ void OBBindings::grabButtons(bool grab, OBClient *client)
       break;
     case MC_Window:
       win = client->frame->plate();
       break;
     case MC_Window:
       win = client->frame->plate();

-      mode = GrabModeSync; // this is handled in the plate's buttonPressHandler
+      mode = GrabModeSync; // this is handled in fireButton

       break;
     default:
       // any other elements already get button events, don't grab on them
       break;
     default:
       // any other elements already get button events, don't grab on them

diff --git a/src/bindings.hh b/src/bindings.hh
index 280c77cd95702aed374c32a942ee6cea494ec7d8..b3078d85a000b9ea0b582c59e35e9bbee0ac00b3 100644 (file)
--- a/src/bindings.hh
+++ b/src/bindings.hh
@@ -77,7 +77,7 @@ private:
                             PyObject *callback) const;
   void assimilate(KeyBindingTree *node);
 
                             PyObject *callback) const;
   void assimilate(KeyBindingTree *node);
 

-  static void reset(OBBindings *self); // the timer's timeout function
+  static void resetChains(OBBindings *self); // the timer's timeout function

 
   typedef std::list <ButtonBinding*> ButtonBindingList;
   ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];
 
   typedef std::list <ButtonBinding*> ButtonBindingList;
   ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];