Fix shadowed variables

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 493e1000c1eb546674053154896504cfae599935..dbd48695277042f6caead446271b2c51434cd6ae 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -146,17 +146,17 @@ void mouse_unbind_all()
 {
     gint i;
     GSList *it;
-    
+
     for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) {
         for (it = bound_contexts[i]; it; it = g_slist_next(it)) {
             ObMouseBinding *b = it->data;
             gint j;
 
             for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
-                GSList *it;
+                GSList *jt;
 
-                for (it = b->actions[j]; it; it = g_slist_next(it))
-                    actions_act_unref(it->data);
+                for (jt = b->actions[j]; jt; jt = g_slist_next(jt))
+                    actions_act_unref(jt->data);
                 g_slist_free(b->actions[j]);
             }
             g_free(b);
@@ -196,7 +196,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     if (it == NULL) return FALSE;
 
     actions_run_acts(b->actions[a], mouse_action_to_user_action(a),
-                     state, x, y, context, c);
+                     state, x, y, button, context, c);
     return TRUE;
 }