IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Continue to load config.auto even if we find config.user.

Browse Source 
* 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.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12913 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2006-01-21 04:12:31 +00:00
parent 108aeb4707
commit dffd616761
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2006-01-20 Derek Atkins <derek@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@employees.org>
* src/core-utils/gnc-gkeyfile-utils.[ch]:

8
src/bin/gnucash-bin.c
View File

@@ -143,8 +143,10 @@ load_user_config(void)
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 @@ load_user_config(void)
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");

1
src/scm/Makefile.am
View File

@@ -13,7 +13,6 @@ gnc_regular_scm_files = \
fin.scm \
help-topics-index.scm \
main-window.scm \
path.scm \
substring-search.scm \
xml-generator.scm