X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32res.h;h=1a31321e4c75af19afe63257a70f039d556f85f5;hp=f4417b8acd45f8e4e40ca9be70a7d31e172ca57c;hb=981c0937e8bdfcf7688625628cd5db226053da0c;hpb=eb1142901b4272c6630ab1af31345a2b8fd6f5dc

diff --git a/w32res.h b/w32res.h
index f4417b8a..1a31321e 100644
--- a/w32res.h
+++ b/w32res.h
@@ -1,6 +1,6 @@
 #ifndef _W32RES_H
 #define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.3 2001/05/26 00:28:36 jongfoster Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.6 2001/05/31 21:37:11 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
@@ -34,6 +34,37 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 1.6  2001/05/31 21:37:11  jongfoster
+ *    GUI changes to rename "permissions file" to "actions file".
+ *
+ *    Revision 1.5  2001/05/29 09:50:24  jongfoster
+ *    Unified blocklist/imagelist/permissionslist.
+ *    File format is still under discussion, but the internal changes
+ *    are (mostly) done.
+ *
+ *    Also modified interceptor behaviour:
+ *    - We now intercept all URLs beginning with one of the following
+ *      prefixes (and *only* these prefixes):
+ *        * http://i.j.b/
+ *        * http://ijbswa.sf.net/config/
+ *        * http://ijbswa.sourceforge.net/config/
+ *    - New interceptors "home page" - go to http://i.j.b/ to see it.
+ *    - Internal changes so that intercepted and fast redirect pages
+ *      are not replaced with an image.
+ *    - Interceptors now have the option to send a binary page direct
+ *      to the client. (i.e. ijb-send-banner uses this)
+ *    - Implemented show-url-info interceptor.  (Which is why I needed
+ *      the above interceptors changes - a typical URL is
+ *      "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
+ *      The previous mechanism would not have intercepted that, and
+ *      if it had been intercepted then it then it would have replaced
+ *      it with an image.)
+ *
+ *    Revision 1.4  2001/05/26 01:26:34  jongfoster
+ *    New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
+ *    This #define cannot be set from ./configure - there's no point, it
+ *    doesn't work yet.  See feature request # 425722
+ *
  *    Revision 1.3  2001/05/26 00:28:36  jongfoster
  *    Automatic reloading of config file.
  *    Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
@@ -119,24 +150,14 @@
 
 /* Break these out so they are easier to extend, but keep consecutive */
 #define ID_TOOLS_EDITJUNKBUSTER           5000
-#define ID_TOOLS_EDITBLOCKERS             5001
-#define ID_TOOLS_EDITPERMISSIONS          5002
-#define ID_TOOLS_EDITFORWARD              5003
-
-#ifdef ACL_FILES
-#define ID_TOOLS_EDITACLS                 5005
-#endif /* def ACL_FILES */
-
-#ifdef USE_IMAGE_LIST
-#define ID_TOOLS_EDITIMAGE                5006
-#endif /* def USE_IMAGE_LIST */
+#define ID_TOOLS_EDITACTIONS              5001
 
 #ifdef PCRS
-#define ID_TOOLS_EDITPERLRE               5008
+#define ID_TOOLS_EDITPERLRE               5002
 #endif /* def PCRS */
 
 #ifdef TRUST_FILES
-#define ID_TOOLS_EDITTRUST                5004
+#define ID_TOOLS_EDITTRUST                5003
 #endif /* def TRUST_FILES */
 
 /*