r14716 - gnucash/branches/remove-group - Merge account trees properly.

[David Hampton]

Author: hampton
Date: 2006-08-22 23:20:42 -0400 (Tue, 22 Aug 2006)
New Revision: 14716
Trac: http://svn.gnucash.org/trac/changeset/14716

Modified:
   gnucash/branches/remove-group/ChangeLog
   gnucash/branches/remove-group/src/app-utils/gnc-account-merge.c
Log:
Merge account trees properly.


Modified: gnucash/branches/remove-group/ChangeLog
===================================================================
--- gnucash/branches/remove-group/ChangeLog	2006-08-23 03:17:29 UTC (rev 14715)
+++ gnucash/branches/remove-group/ChangeLog	2006-08-23 03:20:42 UTC (rev 14716)
@@ -1,5 +1,7 @@
 2006-08-22  David Hampton  <hampton at 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

Modified: gnucash/branches/remove-group/src/app-utils/gnc-account-merge.c
===================================================================
--- gnucash/branches/remove-group/src/app-utils/gnc-account-merge.c	2006-08-23 03:17:29 UTC (rev 14715)
+++ gnucash/branches/remove-group/src/app-utils/gnc-account-merge.c	2006-08-23 03:20:42 UTC (rev 14716)
@@ -43,7 +43,7 @@
     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))