From 2390690d4d4a9cb3c8f28d5b27b8358a73dfde87 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Wed, 23 Aug 2006 03:20:42 +0000 Subject: [PATCH] Merge account trees properly. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/remove-group@14716 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 2 ++ src/app-utils/gnc-account-merge.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ebe303e324..fe195933e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,8 @@ 2006-08-20 David Hampton + * src/app-utils/gnc-account-merge.c: Merge account trees properly. + * src/backend/file/io-gncxml-v2.c: * src/engine/Account.c: Make sure the root account exists when the code asks for it. This works both for reading a new file and a diff --git a/src/app-utils/gnc-account-merge.c b/src/app-utils/gnc-account-merge.c index 98006a7b77..27623a893e 100644 --- a/src/app-utils/gnc-account-merge.c +++ b/src/app-utils/gnc-account-merge.c @@ -44,7 +44,7 @@ account_trees_merge(Account *existing_root, Account *new_accts_root) Account *existing_named, *new_acct; const char *name; - new_acct = (Account*)accounts->data; + new_acct = (Account*)node->data; name = xaccAccountGetName(new_acct); existing_named = gnc_account_lookup_name(existing_root, name); switch (determine_account_merge_disposition(existing_named, new_acct))