X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=4a959751baf995b11e5a569ca0d89953c38f2af4;hp=0d1d54439a4e1d60829b2b169bbbc5aa851bca5b;hb=b8e4d2f10d54ba6e020c89f7b980062bc3ab028b;hpb=83caed4dc7dd892983aa6bc04fd3ed3f7b8b56d3 diff --git a/filters.c b/filters.c index 0d1d5443..4a959751 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.104 2008/03/27 18:27:24 fabiankeil Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.105 2008/03/28 15:13:39 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -40,6 +40,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.104 2008/03/27 18:27:24 fabiankei * * Revisions : * $Log: filters.c,v $ + * Revision 1.105 2008/03/28 15:13:39 fabiankeil + * Remove inspect-jpegs action. + * * Revision 1.104 2008/03/27 18:27:24 fabiankeil * Remove kill-popups action. * @@ -2660,16 +2663,15 @@ struct http_response *direct_response(struct client_state *csp) * enabled for the current request. * * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) + * 1 : action = Action spec to check. * * Returns : TRUE for yes, FALSE otherwise * *********************************************************************/ -inline int content_filters_enabled(const struct client_state *csp) +int content_filters_enabled(const struct current_action_spec *action) { - return (((csp->rlist != NULL) && - (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) || - (csp->action->flags & ACTION_DEANIMATE)); + return ((action->flags & ACTION_DEANIMATE) || + !list_is_empty(action->multi[ACTION_MULTI_FILTER])); } /*