M src/bindings.cc → src/bindings.cc

@@ -339,7 +339,7 @@ 
 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) {
@@ -356,7 +356,7 @@ if (c) win = c->window();
           KeyData *data = new_key_data(win, time, modifiers, key);
           python_callback(p->callback, (PyObject*)data);
           Py_DECREF((PyObject*)data);
-          reset(this);
+          resetChains(this);
         }
         break;
       }
@@ -365,7 +365,7 @@ }
   }
 }
 
-void OBBindings::reset(OBBindings *self)
+void OBBindings::resetChains(OBBindings *self)
 {
   self->_timer.stop();
   self->grabKeys(false);
@@ -435,7 +435,7 @@ win = client->frame->window();
       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

M src/bindings.hh → src/bindings.hh

@@ -77,7 +77,7 @@ KeyBindingTree *buildtree(const StringVect &keylist,
                             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];