X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=2f877685d3e4c14711d818baeebbc8149c867d6a;hp=d6d9d9a6b6ecff026b93d29d3944f7a4edbbd7e6;hb=08e1829b2eff1f19a2afe241099279ee081fb0a1;hpb=86a4423a5e84053a36fea6b04dc36776f5d0463e

diff --git a/actions.c b/actions.c
index d6d9d9a6..2f877685 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.49 2008/03/29 12:13:45 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,13 @@ const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    Revision 1.49  2008/03/29 12:13:45  fabiankeil
+ *    Remove send-wafer and send-vanilla-wafer actions.
+ *
+ *    Revision 1.48  2008/03/28 18:17:14  fabiankeil
+ *    In action_used_to_be_valid(), loop through an array of formerly
+ *    valid actions instead of using an OR-chain of strcmpic() calls.
+ *
  *    Revision 1.47  2008/03/28 15:13:37  fabiankeil
  *    Remove inspect-jpegs action.
  *
@@ -657,7 +664,11 @@ static int action_used_to_be_valid(const char *action)
    static const char *formerly_valid_actions[] = {
       "inspect-jpegs",
       "kill-popups",
-      "treat-forbidden-connects-like-blocks"
+      "send-vanilla-wafer",
+      "send-wafer",
+      "treat-forbidden-connects-like-blocks",
+      "vanilla-wafer",
+      "wafer"
    };
    int i;
 
@@ -1211,7 +1222,7 @@ void free_alias_list(struct action_alias *alias_list)
 
 /*********************************************************************
  *
- * Function    :  load_actions_file
+ * Function    :  load_action_files
  *
  * Description :  Read and parse all the action files and add to files
  *                list.
@@ -1222,7 +1233,7 @@ void free_alias_list(struct action_alias *alias_list)
  * Returns     :  0 => Ok, everything else is an error.
  *
  *********************************************************************/
-int load_actions_file(struct client_state *csp)
+int load_action_files(struct client_state *csp)
 {
    int i;
    int result;