r22291 - gnucash/trunk/src - Bug #672161 - New CSV account and transaction importer

[Geert Janssens]

Author: gjanssens
Date: 2012-08-07 13:25:12 -0400 (Tue, 07 Aug 2012)
New Revision: 22291
Trac: http://svn.gnucash.org/trac/changeset/22291

Modified:
   gnucash/trunk/src/import-export/import-main-matcher.c
   gnucash/trunk/src/register/ledger-core/split-register-model.c
Log:
Bug #672161 - New CSV account and transaction importer
Final patch by Robert Fewell

Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c	2012-08-07 17:24:55 UTC (rev 22290)
+++ gnucash/trunk/src/import-export/import-main-matcher.c	2012-08-07 17:25:12 UTC (rev 22291)
@@ -184,33 +184,9 @@
                                                info->user_data);
             }
         }
-        else
-        {
-            /* transaction skipped -> destroy
-             * Otherwise temporary transactions remains visible if account is open
-             * (see gnc_import_process_trans_item() case GNCImport_CLEAR) */
-/*FIXME            xaccTransDestroy(gnc_import_TransInfo_get_trans(trans_info));
-            xaccTransCommitEdit(gnc_import_TransInfo_get_trans(trans_info)); */
-        }
-
     }
     while (gtk_tree_model_iter_next (model, &iter));
 
-    /* DEBUG ("Deleting") */
-    /* DRH: Is this necessary. Isn't the call to trans_list_delete at
-       the end of this routine going to destroy the entire list store
-       anyway? */
-/*FIXME    for (item = refs_list; item; item = g_slist_next(item))
-    {
-        ref = item->data;
-        path =  gtk_tree_row_reference_get_path(ref);
-        if (gtk_tree_model_get_iter(model, &iter, path))
-            gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-        gtk_tree_path_free(path);
-        gtk_tree_row_reference_free(ref);
-    }
-    g_slist_free(refs_list); */
-
     gnc_gen_trans_list_delete (info);
     /* DEBUG ("End") */
 }

Modified: gnucash/trunk/src/register/ledger-core/split-register-model.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-model.c	2012-08-07 17:24:55 UTC (rev 22290)
+++ gnucash/trunk/src/register/ledger-core/split-register-model.c	2012-08-07 17:25:12 UTC (rev 22291)
@@ -1030,7 +1030,10 @@
     split = gnc_split_register_get_split (reg, virt_loc.vcell_loc);
     trans = xaccSplitGetParent (split);
 
-    return xaccTransGetVoidReason(trans);
+    if(trans == NULL)
+        return g_strdup('\0');
+    else 
+        return xaccTransGetVoidReason(trans);
 }
 
 static char *