X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32res.h;h=f4417b8acd45f8e4e40ca9be70a7d31e172ca57c;hp=002872e51fa84fa2df70d57a58ce37f59fa4b796;hb=20e9db9a6c776639062db57390632b82f3ee0df8;hpb=87a69fc505def6be1c8a4d24ae225c3623b5e861

diff --git a/w32res.h b/w32res.h
index 002872e5..f4417b8a 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.1.1.1 2001/05/15 13:59:08 oes Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.3 2001/05/26 00:28:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
@@ -34,23 +34,48 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    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).
+ *    Most of the global variables have been moved to a new
+ *    struct configuration_spec, accessed through csp->config->globalname
+ *    Most of the globals remaining are used by the Win32 GUI.
+ *
+ *    Revision 1.2  2001/05/20 01:21:20  jongfoster
+ *    Version 2.9.4 checkin.
+ *    - Merged popupfile and cookiefile, and added control over PCRS
+ *      filtering, in new "permissionsfile".
+ *    - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ *      file error you now get a message box (in the Win32 GUI) rather
+ *      than the program exiting with no explanation.
+ *    - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ *      skipping.
+ *    - Removed tabs from "config"
+ *    - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ *    - Bumped up version number.
+ *
  *    Revision 1.1.1.1  2001/05/15 13:59:08  oes
  *    Initial import of version 2.9.3 source tree
  *
  *
  *********************************************************************/
 
+#ifdef WIN_GUI_EDIT
 #define IDS_NEW_BLOCKER                   1
 
 #define ID_NEW_BLOCKER                    100
+#endif /* def WIN_GUI_EDIT */
+
 #define IDR_TRAYMENU                      101
 #define IDI_IDLE                          102
 #define IDR_LOGVIEW                       103
 #define IDR_ACCELERATOR                   104
 #define IDR_POPUP_SELECTION               105
+
+#ifdef WIN_GUI_EDIT
 #define IDD_RULES                         106
-#define IDI_DENYRULE                      107
-#define IDI_ALLOWRULE                     108
+#endif /* def WIN_GUI_EDIT */
+
 
 #define IDI_JUNKBUSTER                    200
 #define IDI_JUNKBUSTER1                   201
@@ -62,6 +87,10 @@
 #define IDI_JUNKBUSTER7                   207
 #define IDI_JUNKBUSTER8                   208
 
+#ifdef WIN_GUI_EDIT
+#define IDI_DENYRULE                      209
+#define IDI_ALLOWRULE                     210
+
 #define IDC_NEW                           300
 #define IDC_ACTION                        301
 #define IDC_RULES                         302
@@ -70,6 +99,7 @@
 #define IDC_MOVEDOWN                      305
 #define IDC_DELETE                        306
 #define IDC_SAVE                          307
+#endif /* def WIN_GUI_EDIT */
 
 #define ID_SHOWWINDOW                     4000
 #define ID_HELP_ABOUTJUNKBUSTER           4001
@@ -86,7 +116,6 @@
 #ifdef TOGGLE
 #define ID_TOGGLE_IJB                     4012
 #endif
-#define ID_RELOAD_CONFIG                  4013
 
 /* Break these out so they are easier to extend, but keep consecutive */
 #define ID_TOOLS_EDITJUNKBUSTER           5000