Merge account trees properly.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/remove-group@14716 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -94,6 +94,8 @@
 
 2006-08-20  David Hampton  <hampton@employees.org>
 
+	* 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

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))