[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-88-gb373423

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  b373423bdd5b8fa1f827cb88cfaf76e563ada92a (commit)
      from  6eb378786509b49a2fc4efdd02af96ee2b9f2cf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b373423bdd5b8fa1f827cb88cfaf76e563ada92a
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Oct 18 22:33:46 2010 +0200

    excludes operations already marked T when importing a file and corrects a memory leak

-----------------------------------------------------------------------

Changes:
diff --git a/src/import.c b/src/import.c
index 9728558..2d399f0 100644
--- a/src/import.c
+++ b/src/import.c
@@ -2912,9 +2912,10 @@ void pointe_opes_importees ( struct struct_compte_importation *imported_account,
 			 &&
 			 ( g_date_compare ( gsb_data_transaction_get_date (transaction_number),
 					    date_fin_comparaison ) <= 0 )
-
 			 &&
-			 !gsb_data_transaction_get_mother_transaction_number (transaction_number))
+			 !gsb_data_transaction_get_mother_transaction_number (transaction_number)
+             &&
+             gsb_data_transaction_get_marked_transaction ( transaction_number ) < 2 )
 			/* on a retouvé une opé de même date et même montant, on l'ajoute à la liste 
              * des opés trouvées */
 			ope_trouvees = g_slist_append ( ope_trouvees,
@@ -3121,6 +3122,7 @@ void pointe_opes_importees ( struct struct_compte_importation *imported_account,
 
 		}
 	}
+    g_slist_free ( ope_trouvees );
 	list_tmp = list_tmp -> next;
     }
 


hooks/post-receive
-- 
grisbi