projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major changes to build system in order to fix these bugs:
[privoxy.git]
/
w32log.c
diff --git
a/w32log.c
b/w32log.c
index
97e0bf1
..
3b7835a
100644
(file)
--- a/
w32log.c
+++ b/
w32log.c
@@
-1,4
+1,4
@@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.1
0 2001/05/31 21:37:11 jongfoster
Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.1
2 2001/07/13 14:04:59 oes
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
@@
-32,6
+32,12
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.10 2001/05/31 21:37:11 jongfoster E
*
* Revisions :
* $Log: w32log.c,v $
*
* Revisions :
* $Log: w32log.c,v $
+ * Revision 1.12 2001/07/13 14:04:59 oes
+ * Removed all #ifdef PCRS
+ *
+ * Revision 1.11 2001/06/07 23:08:12 jongfoster
+ * Forward and ACL edit options removed.
+ *
* Revision 1.10 2001/05/31 21:37:11 jongfoster
* GUI changes to rename "permissions file" to "actions file".
*
* Revision 1.10 2001/05/31 21:37:11 jongfoster
* GUI changes to rename "permissions file" to "actions file".
*
@@
-198,9
+204,7
@@
int g_nFontSize = DEFAULT_LOG_FONT_SIZE;
/* FIXME: this is a kludge */
const char * g_actions_file = NULL;
/* FIXME: this is a kludge */
const char * g_actions_file = NULL;
-#ifdef PCRS
const char * g_re_filterfile = NULL;
const char * g_re_filterfile = NULL;
-#endif
#ifdef TRUST_FILES
const char * g_trustfile = NULL;
#endif /* def TRUST_FILES */
#ifdef TRUST_FILES
const char * g_trustfile = NULL;
#endif /* def TRUST_FILES */
@@
-939,6
+943,8
@@
void ShowLogWindow(BOOL bShow)
* Function : EditFile
*
* Description : Opens the specified setting file for editing.
* Function : EditFile
*
* Description : Opens the specified setting file for editing.
+ * FIXME: What if the file has no associated application. Check for return values
+* from ShellExecute??
*
* Parameters :
* 1 : filename = filename from the config (aka junkbstr.txt) file.
*
* Parameters :
* 1 : filename = filename from the config (aka junkbstr.txt) file.
@@
-1114,11
+1120,9
@@
void OnLogCommand(int nCommand)
EditFile(g_actions_file);
break;
EditFile(g_actions_file);
break;
-#ifdef PCRS
case ID_TOOLS_EDITPERLRE:
EditFile(g_re_filterfile);
break;
case ID_TOOLS_EDITPERLRE:
EditFile(g_re_filterfile);
break;
-#endif
#ifdef TRUST_FILES
case ID_TOOLS_EDITTRUST:
#ifdef TRUST_FILES
case ID_TOOLS_EDITTRUST:
@@
-1177,9
+1181,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));
{
/* Only enable editors if there is a file to edit */
EnableMenuItem(hmenu, ID_TOOLS_EDITACTIONS, MF_BYCOMMAND | (g_actions_file ? MF_ENABLED : MF_GRAYED));
-#ifdef PCRS
EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(hmenu, ID_TOOLS_EDITPERLRE, MF_BYCOMMAND | (g_re_filterfile ? MF_ENABLED : MF_GRAYED));
-#endif
#ifdef TRUST_FILES
EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED));
#endif /* def TRUST_FILES */
#ifdef TRUST_FILES
EnableMenuItem(hmenu, ID_TOOLS_EDITTRUST, MF_BYCOMMAND | (g_trustfile ? MF_ENABLED : MF_GRAYED));
#endif /* def TRUST_FILES */