X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=killpopup.c;h=7043deff98f7b48f932ee3fc59336881157845f0;hb=3b3a3699275014838fe9562233d0973d58875d64;hp=f191b08e71a60843432cb3e2600fc1044f2cc2d2;hpb=9ae6a63f2011f3b51cc764b9155a34bcf3efbcf0;p=privoxy.git diff --git a/killpopup.c b/killpopup.c index f191b08e..7043deff 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,4 +1,4 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.6 2001/07/19 19:11:35 haroon Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.9 2001/07/31 14:44:22 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ @@ -32,6 +32,21 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.6 2001/07/19 19:11:35 haroon * * Revisions : * $Log: killpopup.c,v $ + * Revision 1.9 2001/07/31 14:44:22 oes + * Deleted unused size parameter from filter_popups() + * + * Revision 1.8 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.7 2001/07/20 19:29:25 haroon + * - In v1.5 forgot to add that I implemented LOG_LEVEL_POPUPS in errlog.c, + * errlog.h and killpopup.c. In that case, it is superfluous to have define for + * POPUP_VERBOSE, so I removed the defines and logging is now done + * via log_error(LOG_LEVEL_POPUPS, ....) + * * Revision 1.6 2001/07/19 19:11:35 haroon * - Implemented Guy's idea of replacing window.open( with 1;''.concat( * - Implemented Guy's idea of replacing .resizeTo( with .scrollTo( @@ -82,12 +97,11 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.6 2001/07/19 19:11:35 haroon #include "project.h" #include "killpopup.h" -#include "jcc.h" #include "errlog.h" const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; -#ifdef KILLPOPUPS +#ifdef FEATURE_KILL_POPUPS /********************************************************************* * @@ -100,12 +114,11 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; * * Parameters : * 1 : buff = Buffer to scan and modify. Null terminated. - * 2 : size = Buffer size, excluding null terminator. * * Returns : void * *********************************************************************/ -void filter_popups(char *buff, int size) +void filter_popups(char *buff) { char *popup = NULL; char *close = NULL; @@ -137,7 +150,7 @@ void filter_popups(char *buff, int size) } } - /* Filter all other crap like onUnload onExit etc. (by BREITENB) NEW!*/ + /* Filter onUnload and onExit */ popup=strstr( buff, "'); if (close) { - /* we are now between FIXME: No, we're anywhere! --oes*/ + /* we are now between FIXME: No, we're anywhere! --oes */ p=strstr(popup, "onUnload"); if (p) { @@ -163,7 +176,7 @@ void filter_popups(char *buff, int size) } -#endif /* def KILLPOPUPS */ +#endif /* def FEATURE_KILL_POPUPS */ /* Local Variables: