updates

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@913 57a11ea4-9604-0410-9ed3-97b8803252fd

README

@@ -218,7 +218,7 @@ Main Developers:
 ----------------
 Rob Browning <rlb@cs.utexas.edu> for perl, scheme & GTK port 
 Robin Clark <rclark@hmc.edu> for original X-Accountant
-Jeremy Collins <linux@cyberramp.net> for GnuCash web site & initial GTK code
+Jeremy Collins <linux@cyberramp.net> for GnuCash web site & main-window GTK code
 Linas Vepstas <linas@linas.org> for managing it all
 
 Fixes & Patches:
@@ -240,5 +240,7 @@ Ron Record <rr@sco.com> for SCO Unixware & OpenServer binaries
 Christopher Seawood <cls@seawood.org> for XbaeMatrix core dump
 Richard Skelton <rich@brake.demon.co.uk> for Solaris cleanup
 Henning Spruth <spruth@bigfoot.com> for German text & euro date rework
+Ken Yamaguchi <gooch@ic.EECS.Berkeley.EDU>  QIF import fixes
+
 ... and I am sure that I have missed many others ...
 

src/engine/QIFIO.c

@@ -1013,20 +1013,23 @@ xaccReadQIFAccountGroup( char *datafile )
               xaccFreeAccount(acc); 
               continue;
            }
-           /* free up malloced data if unknown account type */
-           if (-1 == xaccAccountGetType (acc)) {  
-              xaccFreeAccount(acc); 
-              continue;
-           }
 
            /* check to see if we already know this account;
             * if we do, use it, otherwise create it */
            acc_name = xaccAccountGetName (acc);
            preexisting = xaccGetAccountFromName (grp, acc_name);
-           if (preexisting) {
+           if (preexisting) 
+            {
               xaccFreeAccount (acc);
               acc = preexisting;
-           } else {
+           } 
+           else if (-1 == xaccAccountGetType (acc))
+           {  /* free up malloced data if unknown account type */
+              xaccFreeAccount(acc); 
+              continue;
+           }
+           else
+           {
               insertAccount( grp, acc );
            }