[Gnucash-changes] r12913 - gnucash/trunk - Continue to load config.auto even if we find config.user.

[Derek Atkins]

Author: warlord
Date: 2006-01-20 23:12:31 -0500 (Fri, 20 Jan 2006)
New Revision: 12913
Trac: http://svn.gnucash.org/trac/changeset/12913

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/scm/Makefile.am
Log:
Continue to load config.auto even if we find config.user.

	* src/bin/gnucash-bin.c: Load config.auto AND config.user files.
	  Load the .user file first, and then load the .auto.
	* src/scm/Makefile.am:  paths.scm was removed.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-21 03:59:22 UTC (rev 12912)
+++ gnucash/trunk/ChangeLog	2006-01-21 04:12:31 UTC (rev 12913)
@@ -1,3 +1,9 @@
+2006-01-20  Derek Atkins  <derek at ihtfp.com>
+
+	* src/bin/gnucash-bin.c: Load config.auto AND config.user files.
+	  Load the .user file first, and then load the .auto.
+	* src/scm/Makefile.am:  paths.scm was removed.
+	
 2006-01-19  David Hampton  <hampton at employees.org>
 
 	* src/core-utils/gnc-gkeyfile-utils.[ch]:

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2006-01-21 03:59:22 UTC (rev 12912)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2006-01-21 04:12:31 UTC (rev 12913)
@@ -143,8 +143,10 @@
        the 1.4 (unnumbered) files off the list. */
     static const gchar *user_config_files[] = {
         "config-2.0.user", "config-1.8.user", "config-1.6.user", 
-        "config.user", "config-2.0.auto", "config-1.8.auto",
-        "config-1.6.auto", "config.auto", NULL};
+        "config.user", NULL };
+    static const gchar *auto_config_files[] = {
+        "config-2.0.auto", "config-1.8.auto", "config-1.6.auto",
+	"config.auto", NULL};
     static const gchar *saved_report_files[] = {
         "saved-reports-2.0", "saved-reports-1.8", NULL};
     static const gchar *stylesheet_files[] = { "stylesheets-2.0", NULL};
@@ -156,6 +158,8 @@
 
     g_message("loading user configuration");
     try_load_config_array(user_config_files);
+    g_message("loading auto configuration");
+    try_load_config_array(auto_config_files);
     g_message("loading saved reports");
     try_load_config_array(saved_report_files);
     g_message("loading stylesheets");

Modified: gnucash/trunk/src/scm/Makefile.am
===================================================================
--- gnucash/trunk/src/scm/Makefile.am	2006-01-21 03:59:22 UTC (rev 12912)
+++ gnucash/trunk/src/scm/Makefile.am	2006-01-21 04:12:31 UTC (rev 12913)
@@ -13,7 +13,6 @@
   fin.scm \
   help-topics-index.scm \
   main-window.scm \
-  path.scm \
   substring-search.scm \
   xml-generator.scm