2002-12-11 Christian Stimming <stimming@tuhh.de>

* src/import-export/hbci/gnc-hbci-gettrans.c: Fix broken changes
	by Benoit.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7672 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2002-12-11 20:37:14 +00:00
parent b1a8cf98ef
commit f443518d7a
2 changed files with 25 additions and 22 deletions

View File

@ -1,3 +1,8 @@
2002-12-11 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/gnc-hbci-gettrans.c: Fix broken changes
by Benoit.
2002-12-10 Christian Stimming <stimming@tuhh.de>
* src/report/report-system/commodity-utilities.scm: Fix bug

View File

@ -193,40 +193,36 @@ gnc_hbci_gettrans (GtkWidget *parent, Account *gnc_acc)
GNCGenTransaction *importer_gui = NULL;
GNCImportMainMatcher *importer_generic_gui = NULL;
data.use_generic_matcher = gnc_lookup_boolean_option("Online Banking & Importing",
"HBCI Use generic import matcher",
DEFAULT_USE_GENERIC_MATCHER);
data.use_generic_matcher =
gnc_lookup_boolean_option("Online Banking & Importing",
"HBCI Use generic import matcher",
DEFAULT_USE_GENERIC_MATCHER);
if(data.use_generic_matcher)
if(data.use_generic_matcher == TRUE)
{
importer_generic_gui = gnc_gen_trans_list_new(NULL, NULL, TRUE);
data.importer_generic = importer_generic_gui;
}
else
{
importer_gui = gnc_gen_trans_new (NULL, NULL);
gnc_gen_trans_freeze (importer_gui);
gnc_gen_trans_set_fuzzy_amount (importer_gui, 0.0);
data.importer = importer_gui;
}
else
{
importer_generic_gui = gnc_gen_trans_list_new(NULL, NULL, TRUE);
data.importer_generic = importer_generic_gui;
}
data.gnc_acc = gnc_acc;
list_HBCI_Transaction_foreach (trans_list, trans_list_cb, &data);
if(data.use_generic_matcher==FALSE)
{
gnc_gen_trans_thaw (importer_gui);
}
if(data.use_generic_matcher == FALSE)
gnc_gen_trans_thaw (importer_gui);
GNCInteractor_hide (interactor);
if(data.use_generic_matcher)
{
gnc_gen_trans_list_run (importer_generic_gui);
}
if(data.use_generic_matcher == TRUE)
gnc_gen_trans_list_run (importer_generic_gui);
else
{
gnc_gen_trans_run (importer_gui);
}
gnc_gen_trans_run (importer_gui);
}
else {
GNCInteractor_hide (interactor);
@ -328,12 +324,14 @@ static void *trans_list_cb (const HBCI_Transaction *h_trans,
/* Instead of xaccTransCommitEdit(gnc_trans) */
/*gnc_import_add_trans(gnc_trans);*/
if(data->use_generic_matcher)
if(data->use_generic_matcher == TRUE)
{
g_assert (data->importer_generic);
gnc_gen_trans_list_add_trans (data->importer_generic, gnc_trans);
}
else
{
g_assert (data->importer);
gnc_gen_trans_add_trans (data->importer, gnc_trans);
}
return NULL;