summaryrefslogtreecommitdiff
path: root/openbox/actions.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-13 17:12:40 -0400
committerDana Jansens <danakj@orodu.net>2007-07-13 17:12:40 -0400
commitc6f2875d61ce038bcc3b28e28aa26a0648efd752 (patch)
tree97130984adb2e6fd203d021112422c845c744baf /openbox/actions.c
parent70a80ba763f804d3271d85c66234bb1b368f2aa4 (diff)
move directionalcycling actions into the same .c file. make interactive actions all kill delayed mouse focus which would kill the action.
Diffstat (limited to 'openbox/actions.c')
-rw-r--r--openbox/actions.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/openbox/actions.c b/openbox/actions.c
index 0f375267..3f1c34cc 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -293,6 +293,11 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
actions_act_ref(interactive_act);
interactive_initial_state = state;
+
+ /* if using focus_delay, stop the timer now so that focus doesn't go
+ moving on us, which would kill the action */
+ event_halt_focus_delay();
+
return TRUE;
}
else