From: Dana Jansens <danakj@orodu.net>
Date: Sun, 15 Jul 2007 17:27:33 +0000 (-0400)
Subject: Don't cancel interactive action when another one is run which shares the same run... 
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=49b14e7bf5eb6256b69e6da66fbf7a0bca383038;hp=6ea96a8a9759f3219383b513c4836dbef1e7112e;p=chaz%2Fopenbox

Don't cancel interactive action when another one is run which shares the same run function.  This is how actions can cooperate!
---

diff --git a/openbox/actions.c b/openbox/actions.c
index 3f1c34cc..7cabbad5 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -248,7 +248,9 @@ void actions_run_acts(GSList *acts,
 
         actions_setup_data(&data, uact, state, x, y, button, con, client);
 
-        if (!interactive_act || interactive_act->def != act->def) {
+        /* if they have the same run function, then we'll assume they are
+           cooperating and not cancel eachother out */
+        if (!interactive_act || interactive_act->def->run != act->def->run) {
             if (actions_act_is_interactive(act)) {
                 /* cancel the old one */
                 if (interactive_act)