IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow source-code compatibility to upcoming libaqbanking4 in parallel to libaqbanking3.

Browse Source 
Patch contributed by Martin Preuss, modified by CS.
BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17620 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2008-10-05 20:54:34 +00:00
parent 9a20ff377d
commit 184a50a771
6 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/import-export/aqbanking/druid-ab-initial.c
View File

@ -161,7 +161,11 @@ dai_destroy_cb(GtkObject *object, gpointer user_data)
}
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 @@ dai_match_page_prepare_cb(GnomeDruidPage *druid_page, GtkWidget *widget,
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 @@ banking_has_accounts(AB_BANKING *banking)
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 @@ banking_has_accounts(AB_BANKING *banking)
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;
}

12
src/import-export/aqbanking/gnc-ab-getbalance.c
View File

@ -62,7 +62,11 @@ gnc_ab_getbalance(GtkWidget *parent, Account *gnc_acc)
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 @@ cleanup:
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);
}

12
src/import-export/aqbanking/gnc-ab-gettrans.c
View File

@ -119,7 +119,11 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
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 @@ cleanup:
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);
}

12
src/import-export/aqbanking/gnc-ab-transfer.c
View File

@ -97,7 +97,11 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
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 @@ cleanup:
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);
}

7
src/import-export/aqbanking/gnc-ab-utils.h
View File

@ -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"

10
src/import-export/aqbanking/gnc-file-aqb-import.c
View File

@ -100,7 +100,11 @@ gnc_file_aqbanking_import(const gchar *aqbanking_importername,
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 @@ cleanup:
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)