From: oes <oes@users.sourceforge.net>
Date: Wed, 4 Sep 2002 15:48:33 +0000 (+0000)
Subject: Synced with the stable branch:
X-Git-Tag: v_3_1_archive_branchpoint~188
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=bb28950e825b8ccfca430b136d06704c9efc595f

Synced with the stable branch:
    Revision 1.48.2.1  2002/08/21 17:58:05  oes
    Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
---

diff --git a/src/loadcfg.c b/src/loadcfg.c
index e041463c..15c78a4e 100644
--- a/src/loadcfg.c
+++ b/src/loadcfg.c
@@ -1,7 +1,7 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 2.0 2002/06/04 14:34:21 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 2.1 2002/06/04 17:22:36 jongfoster Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/src/loadcfg.c,v $
+ * File        :  $Source: /cvsroot/ijbswa//current/src/loadcfg.c,v $
  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the
@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 2.0 2002/06/04 14:34:21 jongfoster
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 2.1  2002/06/04 17:22:36  jongfoster
+ *    Adding comments
+ *
  *    Revision 2.0  2002/06/04 14:34:21  jongfoster
  *    Moving source files to src/
  *
@@ -1475,7 +1478,8 @@ struct configuration_spec * load_config(void)
 /* FIXME: this is a kludge for win32 */
 #if defined(_WIN32) && !defined (_WIN_CONSOLE)
 
-   g_actions_file     = config->actions_file[0]; /* FIXME only works for first action file */
+   g_default_actions_file  = config->actions_file[1]; /* FIXME Hope this is default.action */
+   g_user_actions_file = config->actions_file[2]; /* FIXME Hope this is user.action */
    g_re_filterfile    = config->re_filterfile;
 
 #ifdef FEATURE_TRUST