remove that shti

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index bbd59804455a44498d6d7e826e09fe7a3b4a8ec7..1cd8f42faef1a7436616616e68d48d2434fad54b 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -164,12 +164,12 @@ struct _ObAction {
    action_resize_relative_vert - the delta
 */
 
-ObAction *action_from_string(char *name, ObUserAction uact);
+ObAction *action_from_string(const gchar *name, ObUserAction uact);
 ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        ObUserAction uact);
 void action_free(ObAction *a);
 
-/*! Executes an action.
+/*! Executes a list of actions.
   @param c The client associated with the action. Can be NULL.
   @param state The keyboard modifiers state at the time the user action occured
   @param button The mouse button used to execute the action.
@@ -180,21 +180,21 @@ void action_free(ObAction *a);
   @param done If the action is completing an interactive action. This only
          affects interactive actions, but should generally always be FALSE.
 */
-void action_run_full(ObAction *a, struct _ObClient *c,
+void action_run_list(GSList *acts, struct _ObClient *c,
                      guint state, guint button, gint x, gint y,
                      gboolean cancel, gboolean done);
 
 #define action_run_mouse(a, c, s, b, x, y) \
-    action_run_full(a, c, s, b, x, y, FALSE, FALSE)
+    action_run_list(a, c, s, b, x, y, FALSE, FALSE)
 
 #define action_run_interactive(a, c, s, n, d) \
-    action_run_full(a, c, s, 0, -1, -1, n, d)
+    action_run_list(a, c, s, 0, -1, -1, n, d)
 
 #define action_run_key(a, c, s, x, y) \
-    action_run_full(a, c, s, 0, x, y, FALSE,FALSE)
+    action_run_list(a, c, s, 0, x, y, FALSE, FALSE)
 
 #define action_run(a, c, s) \
-    action_run_full(a, c, s, 0, -1, -1, FALSE,FALSE)
+    action_run_list(a, c, s, 0, -1, -1, FALSE, FALSE)
 
 /* Execute */
 void action_execute(union ActionData *data);