AUDIT: r17620 - gnucash/trunk/src/import-export/aqbanking - Allow source-code compatibility to upcoming libaqbanking4 in parallel to libaqbanking3.
Christian Stimming
cstim at cvs.gnucash.org
Sun Oct 5 16:54:34 EDT 2008
Author: cstim
Date: 2008-10-05 16:54:34 -0400 (Sun, 05 Oct 2008)
New Revision: 17620
Trac: http://svn.gnucash.org/trac/changeset/17620
Modified:
gnucash/trunk/src/import-export/aqbanking/druid-ab-initial.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-getbalance.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-gettrans.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c
Log:
Allow source-code compatibility to upcoming libaqbanking4 in parallel to libaqbanking3.
Patch contributed by Martin Preuss, modified by CS.
BP
Modified: gnucash/trunk/src/import-export/aqbanking/druid-ab-initial.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/druid-ab-initial.c 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/druid-ab-initial.c 2008-10-05 20:54:34 UTC (rev 17620)
@@ -161,7 +161,11 @@
}
if (info->gnc_hash) {
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(info->api, 0);
+#else
AB_Banking_OnlineFini(info->api);
+#endif
g_hash_table_destroy(info->gnc_hash);
info->gnc_hash = NULL;
}
@@ -323,7 +327,11 @@
info->match_page_prepared = TRUE;
/* Load aqbanking accounts */
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineInit(info->api, 0);
+#else
AB_Banking_OnlineInit(info->api);
+#endif
/* Determine current mapping */
root = gnc_book_get_root_account(gnc_get_current_book());
@@ -362,7 +370,11 @@
g_return_val_if_fail(banking, FALSE);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineInit(banking, 0);
+#else
AB_Banking_OnlineInit(banking);
+#endif
accl = AB_Banking_GetAccounts(banking);
if (accl && (AB_Account_List2_GetSize(accl) > 0))
@@ -373,7 +385,11 @@
if (accl)
AB_Account_List2_free(accl);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(banking, 0);
+#else
AB_Banking_OnlineFini(banking);
+#endif
return result;
}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-getbalance.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-getbalance.c 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-getbalance.c 2008-10-05 20:54:34 UTC (rev 17620)
@@ -62,7 +62,11 @@
g_warning("gnc_ab_gettrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -116,6 +120,10 @@
if (job)
AB_Job_free(job);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-gettrans.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-gettrans.c 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-gettrans.c 2008-10-05 20:54:34 UTC (rev 17620)
@@ -119,7 +119,11 @@
g_warning("gnc_ab_gettrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -204,6 +208,10 @@
if (from_date)
GWEN_Time_free(from_date);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c 2008-10-05 20:54:34 UTC (rev 17620)
@@ -97,7 +97,11 @@
g_warning("gnc_ab_maketrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_maketrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -294,6 +298,10 @@
if (td)
gnc_ab_trans_dialog_free(td);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2008-10-05 20:54:34 UTC (rev 17620)
@@ -41,6 +41,13 @@
G_BEGIN_DECLS
+#if (AQBANKING_VERSION_MAJOR > 3) || \
+ ((AQBANKING_VERSION_MAJOR == 3) && \
+ (AQBANKING_VERSION_MINOR == 9))
+/** Defined if libaqbanking4 as opposed to libaqbanking3 is being used */
+# define AQBANKING_VERSION_4_PLUS
+#endif
+
#define GCONF_SECTION_AQBANKING "dialogs/import/hbci"
#define KEY_FORMAT_SWIFT940 "format_swift_mt940"
#define KEY_FORMAT_SWIFT942 "format_swift_mt942"
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c 2008-10-05 20:24:14 UTC (rev 17619)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c 2008-10-05 20:54:34 UTC (rev 17620)
@@ -100,7 +100,11 @@
g_warning("gnc_file_aqbanking_import: Couldn't get AqBanking API");
goto cleanup;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_file_aqbanking_import: "
"Couldn't initialize AqBanking API");
goto cleanup;
@@ -199,7 +203,11 @@
if (gui)
gnc_GWEN_Gui_release(gui);
if (online)
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
AB_Banking_OnlineFini(api);
+#endif
if (api)
gnc_AB_BANKING_fini(api);
if (dtaus_fd != -1)
More information about the gnucash-changes
mailing list