Consistern name for filters file

diff --git a/w32.rc b/w32.rc
index 154b2ef..9d32525 100644 (file)
--- a/w32.rc
+++ b/w32.rc
@@ -4,8 +4,8 @@
  *
  * Purpose     :  Windows GUI resource script.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2002 members of\r
- *                the Privoxy team.  http://privoxy.org/\r
+ * Copyright   :  Written by and Copyright (C) 2001-2002 members of
+ *                the Privoxy team.  http://privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -31,6 +31,9 @@
  *
  * Revisions   :
  *    $Log: w32.rc,v $
+ *    Revision 1.13  2002/03/24 12:03:47  jongfoster
+ *    Name change
+ *
  *    Revision 1.12  2001/07/30 22:16:07  jongfoster
  *    Tidying up #defines:
  *    - All feature #defines are now of the form FEATURE_xxx
@@ -215,7 +218,7 @@ BEGIN
             MENUITEM "&Configuration...",           ID_TOOLS_EDITCONFIG
             MENUITEM                                SEPARATOR
             MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
-            MENUITEM "Perl &Regexps...",            ID_TOOLS_EDITPERLRE
+            MENUITEM "&Filters...",                 ID_TOOLS_EDITFILTERS
 #ifdef FEATURE_TRUST
             MENUITEM "&Trust...",                   ID_TOOLS_EDITTRUST
 #endif /* def FEATURE_TRUST */
@@ -256,7 +259,7 @@ BEGIN
         MENUITEM "&Configuration...",           ID_TOOLS_EDITCONFIG
         MENUITEM                                SEPARATOR
         MENUITEM "&Actions...",                 ID_TOOLS_EDITACTIONS
-            MENUITEM "Perl &Regexps...",        ID_TOOLS_EDITPERLRE
+            MENUITEM "&Filters...",             ID_TOOLS_EDITFILTERS
 #ifdef FEATURE_TRUST
             MENUITEM "&Trust...",               ID_TOOLS_EDITTRUST
 #endif /* def FEATURE_TRUST */

diff --git a/w32log.c b/w32log.c
index 81dce2e..34827a1 100644 (file)
--- a/w32log.c
+++ b/w32log.c
@@ -1,4 +1,4 @@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.19 2002/01/17 21:04:17 jongfoster Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.20 2002/03/24 12:03:47 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.c,v $
@@ -32,6 +32,9 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.19 2002/01/17 21:04:17 jongfoster E
  *
  * Revisions   :
  *    $Log: w32log.c,v $
+ *    Revision 1.20  2002/03/24 12:03:47  jongfoster
+ *    Name change
+ *
  *    Revision 1.19  2002/01/17 21:04:17  jongfoster
  *    Replacing hard references to the URL of the config interface
  *    with #defines from project.h
@@ -1109,7 +1112,7 @@ void OnLogCommand(int nCommand)
          EditFile(g_actions_file);
          break;
 
-      case ID_TOOLS_EDITPERLRE:
+      case ID_TOOLS_EDITFILTERS:
          EditFile(g_re_filterfile);
          break;
 
@@ -1164,7 +1167,7 @@ void OnLogInitMenu(HMENU hmenu)
 {
    /* Only enable editors if there is a file to edit */
    EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED));
-   EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
+   EnableMenuItem(hmenu, ID_TOOLS_EDITFILTERS, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
 #ifdef FEATURE_TRUST
    EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED));
 #endif /* def FEATURE_TRUST */

diff --git a/w32res.h b/w32res.h
index 269d070..fc5f07c 100644 (file)
--- a/w32res.h
+++ b/w32res.h
@@ -1,6 +1,6 @@
 #ifndef W32RES_H_INCLUDED
 #define W32RES_H_INCLUDED
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.10 2001/07/30 22:08:36 jongfoster Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.11 2002/03/24 12:03:47 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 1.11  2002/03/24 12:03:47  jongfoster
+ *    Name change
+ *
  *    Revision 1.10  2001/07/30 22:08:36  jongfoster
  *    Tidying up #defines:
  *    - All feature #defines are now of the form FEATURE_xxx
@@ -143,7 +146,7 @@
 /* Break these out so they are easier to extend, but keep consecutive */
 #define ID_TOOLS_EDITCONFIG               5000
 #define ID_TOOLS_EDITACTIONS              5001
-#define ID_TOOLS_EDITPERLRE               5002
+#define ID_TOOLS_EDITFILTERS              5002
 
 #ifdef FEATURE_TRUST
 #define ID_TOOLS_EDITTRUST                5003