From: Dana Jansens <danakj@orodu.net>
Date: Fri, 19 Sep 2003 17:41:05 +0000 (+0000)
Subject: use the new action ru system which always runs lists of actions instead of individual... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=e5908c3f897156b13d1e7592c155bfd5ca2a82a4;p=chaz%2Fopenbox

use the new action ru system which always runs lists of actions instead of individual ones
---

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 54de380c..7a74b427 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -39,7 +39,7 @@ KeyBindingTree *keyboard_firstnode;
 typedef struct {
     guint state;
     ObClient *client;
-    ObAction *action;
+    GSList *actions;
     ObFrameContext context;
 } ObInteractiveState;
 
@@ -178,7 +178,7 @@ void keyboard_interactive_grab(guint state, ObClient *client,
 
     s->state = state;
     s->client = client;
-    s->action = action;
+    s->actions = g_slist_append(NULL, action);
 
     interactive_states = g_slist_append(interactive_states, s);
 }
@@ -186,8 +186,9 @@ void keyboard_interactive_grab(guint state, ObClient *client,
 void keyboard_interactive_end(ObInteractiveState *s,
                               guint state, gboolean cancel)
 {
-    action_run_interactive(s->action, s->client, state, cancel, TRUE);
+    action_run_interactive(s->actions, s->client, state, cancel, TRUE);
 
+    g_slist_free(s->actions);
     g_free(s);
 
     interactive_states = g_slist_remove(interactive_states, s);
@@ -276,13 +277,11 @@ void keyboard_event(ObClient *client, const XEvent *e)
                 curpos = p;
                 grab_keys(TRUE);
             } else {
-                GSList *it;
-
-                for (it = p->actions; it; it = it->next)
-                    action_run_key(it->data, client, e->xkey.state,
-                                   e->xkey.x_root, e->xkey.y_root);
 
                 keyboard_reset_chains();
+
+                action_run_key(p->actions, client, e->xkey.state,
+                               e->xkey.x_root, e->xkey.y_root);
             }
             break;
         }
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 87b269f8..de84dbf0 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -767,12 +767,8 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
 
         if (func)
             func(entry, state, data);
-        else {
-            GSList *it;
-
-            for (it = acts; it; it = g_slist_next(it))
-                action_run(it->data, client, state);
-        }
+        else
+            action_run(acts, client, state);
     }
 }
 
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 703ea36b..eb206a11 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -167,8 +167,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     /* if not bound, then nothing to do! */
     if (it == NULL) return FALSE;
 
-    for (it = b->actions[a]; it; it = it->next)
-        action_run_mouse(it->data, c, state, button, x, y);
+    action_run_mouse(b->actions[a], c, state, button, x, y);
     return TRUE;
 }