supply the same interface with optional arguments as before. increment callback funct...

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index f77acc2fb79c194c855f7c4eb4a62fb03ea65062..28a5756b6ad8433e278b99475fd1f0a170c995e1 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -153,7 +153,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
 
   // XXX: dont load this every time!!@*
   long dblclick;
-  if (!python_get_long("double_click_delay", &dblclick))
+  if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick))
     dblclick = 300;
 
   if (e.time - _release.time < (unsigned)dblclick &&
@@ -230,7 +230,7 @@ void Actions::keyReleaseHandler(const XKeyEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
 
   // remove from the state the mask of the modifier being released, if it is
-  // a modifier key being released (XXX this is a little ugly..)
+  // a modifier key being released (this is a little ugly..)
   const XModifierKeymap *map = otk::display->modifierMap();
   const int mask_table[] = {
     ShiftMask, LockMask, ControlMask, Mod1Mask,
@@ -283,7 +283,7 @@ void Actions::motionHandler(const XMotionEvent &e)
     int dx = x_root - _posqueue[0]->pos.x();
     int dy = y_root - _posqueue[0]->pos.y();
     // XXX: dont get this from python every time!
-    if (!python_get_long("drag_threshold", &threshold))
+    if (!python_get_long("DRAG_THRESHOLD", &threshold))
       threshold = 0;
     if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
       return; // not at the threshold yet