[Gnucash-changes] r12972 - gnucash/trunk - Factor out importing
functions that might be useful for mt940 importer.
Christian Stimming
cstim at cvs.gnucash.org
Tue Jan 24 15:43:06 EST 2006
Author: cstim
Date: 2006-01-24 15:43:05 -0500 (Tue, 24 Jan 2006)
New Revision: 12972
Trac: http://svn.gnucash.org/trac/changeset/12972
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h
gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
Log:
Factor out importing functions that might be useful for mt940 importer.
2006-01-24 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/gnc-hbci-gettrans.h: Factor out importing
functions that might be useful for mt940 importer.
* src/import-export/hbci/gnc-hbci-transfer.c: Fix wrong amount
sign.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-01-24 01:20:03 UTC (rev 12971)
+++ gnucash/trunk/ChangeLog 2006-01-24 20:43:05 UTC (rev 12972)
@@ -1,3 +1,11 @@
+2006-01-24 Christian Stimming <stimming at tuhh.de>
+
+ * src/import-export/hbci/gnc-hbci-gettrans.h: Factor out importing
+ functions that might be useful for mt940 importer.
+
+ * src/import-export/hbci/gnc-hbci-transfer.c: Fix wrong amount
+ sign.
+
2006-01-23 Derek Atkins <derek at ihtfp.com>
* src/engine/test/Makefile.am: add explicit libdep on libcore-utils.la
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c 2006-01-24 01:20:03 UTC (rev 12971)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c 2006-01-24 20:43:05 UTC (rev 12972)
@@ -199,18 +199,8 @@
trans_list = AB_JobGetTransactions_GetTransactions(trans_job);
if (trans_list && (AB_Transaction_List2_GetSize(trans_list) > 0)) {
- struct trans_list_data data;
- GNCImportMainMatcher *importer_generic_gui =
- gnc_gen_trans_list_new(NULL, NULL, TRUE, 14);
-
- data.importer_generic = importer_generic_gui;
- data.gnc_acc = gnc_acc;
-
- AB_Transaction_List2_ForEach (trans_list, trans_list_cb, &data);
-
- if (run_until_done)
- return gnc_gen_trans_list_run (importer_generic_gui);
- return TRUE;
+ /* Final importing part. */
+ return gnc_hbci_import_final(parent, gnc_acc, trans_list, run_until_done);
}
dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
@@ -226,6 +216,31 @@
}
+gboolean
+gnc_hbci_import_final(GtkWidget *parent,
+ Account *gnc_acc,
+ AB_TRANSACTION_LIST2 *trans_list,
+ gboolean run_until_done)
+{
+ struct trans_list_data data;
+ GNCImportMainMatcher *importer_generic_gui;
+
+ if (!trans_list || (AB_Transaction_List2_GetSize(trans_list) == 0))
+ return TRUE;
+
+ importer_generic_gui = gnc_gen_trans_list_new(parent, NULL, TRUE, 14);
+
+ data.importer_generic = importer_generic_gui;
+ data.gnc_acc = gnc_acc;
+
+ AB_Transaction_List2_ForEach (trans_list, trans_list_cb, &data);
+
+ if (run_until_done)
+ return gnc_gen_trans_list_run (importer_generic_gui);
+ return TRUE;
+}
+
+
/* list_AB_TRANSACTION_foreach callback. The Conversion from HBCI to
GNC transaction is done here, once for each AB_TRANSACTION. */
static AB_TRANSACTION *trans_list_cb(AB_TRANSACTION *h_trans, void *user_data)
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h 2006-01-24 01:20:03 UTC (rev 12971)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.h 2006-01-24 20:43:05 UTC (rev 12972)
@@ -38,5 +38,13 @@
const AB_JOB *trans_job,
gboolean run_until_done);
+/** Finalize the final importing part of a GetTrans job. Returns true
+ * if everything has been finished succesfully. */
+gboolean
+gnc_hbci_import_final(GtkWidget *parent,
+ Account *gnc_acc,
+ AB_TRANSACTION_LIST2 *trans_list,
+ gboolean run_until_done);
+
#endif /* GNC_HBCI_GETTRANS_H */
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c 2006-01-24 01:20:03 UTC (rev 12971)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c 2006-01-24 20:43:05 UTC (rev 12972)
@@ -262,7 +262,7 @@
gnc_xfer_dialog_set_amount (transdialog, gnc_numeric_neg (amount));
case SINGLE_TRANSFER:
default:*/
- gnc_xfer_dialog_set_amount (transdialog, gnc_numeric_neg (amount));
+ gnc_xfer_dialog_set_amount (transdialog, amount);
/*}*/
/* gnc_xfer_dialog_toggle_currency_frame (transdialog, FALSE); */
More information about the gnucash-changes
mailing list