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

[AQB] Require AQBanking 6.4.0 and Gwenhywfar 5.8.0.

Browse Source 
Remove all ifdef code for older versions.
This commit is contained in:
John Ralls 2022-10-03 14:24:44 -07:00
parent ca0d86a3a3
commit 86118b3817
12 changed files with 18 additions and 774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.github/workflows/ci-tests.yml vendored
View File

@ -2,9 +2,9 @@ name: ci-tests
on: [push, pull_request] on: [push, pull_request]
permissions: {} permissions: {}
jobs: jobs:
ci_tests_ubuntu-18: ci_tests_ubuntu-22:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
name: Ubuntu-18.04 CI Tests name: Ubuntu-22.04 CI Tests
env: env:
TZ: America/Los_Angeles TZ: America/Los_Angeles
steps: steps:
@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- run: sudo apt-get update - run: sudo apt-get update
- name: Install additional dependencies - name: Install additional dependencies
run: sudo apt-get install -y cmake libxslt-dev xsltproc ninja-build libboost-all-dev libgtk-3-dev guile-2.2-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev googletest run: sudo apt-get install -y gettext cmake libxslt-dev xsltproc ninja-build libboost-all-dev libgtk-3-dev guile-2.2-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev googletest
- name: Install language packs. - name: Install language packs.
run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr
- run: | - run: |
@ -38,44 +38,3 @@ jobs:
with: with:
name: TestLog name: TestLog
path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log
ci_tests_ubuntu-20:
runs-on: ubuntu-20.04
name: Ubuntu-20.04 CI Tests
env:
TZ: America/Los_Angeles
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install apt utils
run: sudo apt-get install -y --no-install-recommends apt-utils
- name: Update apt
run: |
sudo sed -i -e 's/^# deb-src/deb-src/' /etc/apt/sources.list
sudo apt-get update -y
- name: Install additional dependencies
run: |
sudo apt-get build-dep -y gnucash
sudo apt-get install ninja-build guile-3.0-dev libboost-program-options-dev
- name: Install language packs.
run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr
- run: |
echo "ROOT_DIR=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
- name: Create Directories
run: |
pwd
mkdir $ROOT_DIR/inst
mkdir build
- name: Configure GnuCash
run: |
cd build
cmake -G Ninja -DWITH_PYTHON=ON -DCMAKE_INSTALL_PREFIX=$ROOT_DIR/inst $GITHUB_WORKSPACE
- name: Build and Test GnuCash
run: |
cd build
ninja
ninja check
- uses: actions/upload-artifact@v2
if: failure()
with:
name: TestLog
path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log

6
CMakeLists.txt
View File

@ -48,7 +48,7 @@ include (TestBigEndian)
# SQL, put -D WITH_SQL=OFF on the command line. # SQL, put -D WITH_SQL=OFF on the command line.
option (WITH_SQL "Build this project with SQL (libdbi) support" ON) option (WITH_SQL "Build this project with SQL (libdbi) support" ON)
option (WITH_AQBANKING "Build this project with aqbanking (online banking) support" ON) option (WITH_AQBANKING "Build this project with aqbanking (online banking and a variety of file import formats) support" ON)
option (WITH_GNUCASH "Build all of GnuCash, not just the library" ON) option (WITH_GNUCASH "Build all of GnuCash, not just the library" ON)
option (WITH_OFX "compile with ofx support (needs LibOFX)" ON) option (WITH_OFX "compile with ofx support (needs LibOFX)" ON)
option (WITH_PYTHON "enable python plugin and bindings" OFF) option (WITH_PYTHON "enable python plugin and bindings" OFF)
@ -355,8 +355,8 @@ find_guile_dirs()
# ############################################################ # ############################################################
if (WITH_AQBANKING) if (WITH_AQBANKING)
pkg_check_modules (GWENHYWFAR REQUIRED gwenhywfar>=4.20) pkg_check_modules (GWENHYWFAR REQUIRED gwenhywfar>=5.8.0)
pkg_check_modules (AQBANKING REQUIRED aqbanking>=5.7.8) pkg_check_modules (AQBANKING REQUIRED aqbanking>=6.4.0)
set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}" set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}"
"${GWENHYWFAR_INCLUDE_DIRS}") "${GWENHYWFAR_INCLUDE_DIRS}")
set(CMAKE_REQUIRED_LIBRARIES "${AQBANKING_LD_FLAGS}") set(CMAKE_REQUIRED_LIBRARIES "${AQBANKING_LD_FLAGS}")

5
README.dependencies
View File

@ -93,9 +93,8 @@ Libraries/Deps
optional optional
-------- --------
aqbanking 5.7.8 online banking; Note that 6.1.0 aqbanking 6.4.0 online banking and SWIFT
gwenhywfar 4.20.0 or higher is needed for German gwenhywfar 5.8.0 file imports.
FinTS.
python 3.6.0 python bindings; headers python 3.6.0 python bindings; headers
required, not just binaries. required, not just binaries.

86
gnucash/import-export/aqb/assistant-ab-initial.c
View File

@ -40,10 +40,8 @@
#include "gnc-ab-utils.h" /* For version macros */ #include "gnc-ab-utils.h" /* For version macros */
#include <aqbanking/banking.h> #include <aqbanking/banking.h>
#ifdef AQBANKING6
#include <aqbanking/types/account_spec.h> #include <aqbanking/types/account_spec.h>
#include <gwenhywfar/gui.h> #include <gwenhywfar/gui.h>
#endif
#include <glib.h> #include <glib.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
@ -65,9 +63,6 @@
#include "gnc-session.h" #include "gnc-session.h"
#include "import-account-matcher.h" #include "import-account-matcher.h"
#include "import-utilities.h" #include "import-utilities.h"
#ifndef AQBANKING6
# include <aqbanking/dlg_setup.h>
#endif
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_ASSISTANT; static QofLogModule log_module = GNC_MOD_ASSISTANT;
@ -92,10 +87,8 @@ void aai_page_prepare (GtkAssistant *assistant, gpointer user_data);
void aai_button_clicked_cb(GtkButton *button, gpointer user_data); void aai_button_clicked_cb(GtkButton *button, gpointer user_data);
void aai_match_delete_button_clicked_cb(GtkButton *button, gpointer user_data); void aai_match_delete_button_clicked_cb(GtkButton *button, gpointer user_data);
#ifdef AQBANKING6
static guint aai_ab_account_hash(gconstpointer v); static guint aai_ab_account_hash(gconstpointer v);
static gboolean aai_ab_account_equal(gconstpointer v1, gconstpointer v2); static gboolean aai_ab_account_equal(gconstpointer v1, gconstpointer v2);
#endif
void aai_match_page_prepare (GtkAssistant *assistant, gpointer user_data); void aai_match_page_prepare (GtkAssistant *assistant, gpointer user_data);
static gboolean banking_has_accounts(AB_BANKING *banking); static gboolean banking_has_accounts(AB_BANKING *banking);
@ -207,9 +200,6 @@ aai_destroy_cb(GtkWidget *object, gpointer user_data)
if (info->gnc_hash) if (info->gnc_hash)
{ {
#ifndef AQBANKING6
AB_Banking_OnlineFini(info->api);
#endif
g_hash_table_destroy(info->gnc_hash); g_hash_table_destroy(info->gnc_hash);
info->gnc_hash = NULL; info->gnc_hash = NULL;
} }
@ -268,16 +258,7 @@ aai_button_clicked_cb(GtkButton *button, gpointer user_data)
} }
{ {
#ifdef AQBANKING6
GWEN_DIALOG *dlg = AB_Banking_CreateSetupDialog(banking); GWEN_DIALOG *dlg = AB_Banking_CreateSetupDialog(banking);
#else
GWEN_DIALOG *dlg = AB_SetupDialog_new(banking);
if (AB_Banking_OnlineInit(banking) != 0)
{
PERR("Got error on AB_Banking_OnlineInit!");
}
#endif
if (!dlg) if (!dlg)
{ {
PERR("Could not lookup Setup Dialog of aqbanking!"); PERR("Could not lookup Setup Dialog of aqbanking!");
@ -292,12 +273,6 @@ aai_button_clicked_cb(GtkButton *button, gpointer user_data)
} }
GWEN_Dialog_free(dlg); GWEN_Dialog_free(dlg);
} }
#ifndef AQBANKING6
if (AB_Banking_OnlineFini(banking) != 0)
{
PERR("Got error on AB_Banking_OnlineFini!");
}
#endif
} }
/* Enable the Assistant Buttons if we accounts */ /* Enable the Assistant Buttons if we accounts */
@ -369,7 +344,6 @@ aai_match_delete_button_clicked_cb(GtkButton *button, gpointer user_data)
} }
} }
#ifdef AQBANKING6
static guint static guint
aai_ab_account_hash (gconstpointer v) aai_ab_account_hash (gconstpointer v)
{ {
@ -393,7 +367,6 @@ aai_ab_account_equal (gconstpointer v1, gconstpointer v2)
return uid1 == uid2; return uid1 == uid2;
} }
} }
#endif
static void static void
insert_acc_into_revhash_cb(gpointer ab_acc, gpointer gnc_acc, gpointer revhash) insert_acc_into_revhash_cb(gpointer ab_acc, gpointer gnc_acc, gpointer revhash)
@ -424,17 +397,9 @@ aai_match_page_prepare (GtkAssistant *assistant, gpointer user_data)
/* Do not run this twice */ /* Do not run this twice */
if (!info->match_page_prepared) if (!info->match_page_prepared)
{ {
#ifndef AQBANKING6
/* Load aqbanking accounts */
AB_Banking_OnlineInit(info->api);
#endif
/* Determine current mapping */ /* Determine current mapping */
root = gnc_book_get_root_account(gnc_get_current_book()); root = gnc_book_get_root_account(gnc_get_current_book());
#ifdef AQBANKING6
info->gnc_hash = g_hash_table_new(&aai_ab_account_hash, &aai_ab_account_equal); info->gnc_hash = g_hash_table_new(&aai_ab_account_hash, &aai_ab_account_equal);
#else
info->gnc_hash = g_hash_table_new(&g_direct_hash, &g_direct_equal);
#endif
data.api = info->api; data.api = info->api;
data.hash = info->gnc_hash; data.hash = info->gnc_hash;
gnc_account_foreach_descendant(root, (AccountCb) hash_from_kvp_acc_cb, &data); gnc_account_foreach_descendant(root, (AccountCb) hash_from_kvp_acc_cb, &data);
@ -479,24 +444,11 @@ banking_has_accounts(AB_BANKING *banking)
g_return_val_if_fail(banking, FALSE); g_return_val_if_fail(banking, FALSE);
#ifdef AQBANKING6
if (AB_Banking_GetAccountSpecList (banking, &accl) >= 0 && if (AB_Banking_GetAccountSpecList (banking, &accl) >= 0 &&
accl && AB_AccountSpec_List_GetCount (accl)) accl && AB_AccountSpec_List_GetCount (accl))
result = TRUE; result = TRUE;
if (accl) if (accl)
AB_AccountSpec_List_free (accl); AB_AccountSpec_List_free (accl);
#else
AB_Banking_OnlineInit(banking);
accl = AB_Banking_GetAccounts(banking);
if (accl && (AB_Account_List2_GetSize(accl) > 0))
result = TRUE;
if (accl)
AB_Account_List2_free(accl);
AB_Banking_OnlineFini(banking);
#endif
return result; return result;
} }
@ -521,17 +473,9 @@ ab_account_longname(const GNC_AB_ACCOUNT_SPEC *ab_acc)
g_return_val_if_fail(ab_acc, NULL); g_return_val_if_fail(ab_acc, NULL);
#ifdef AQBANKING6
bankcode = AB_AccountSpec_GetBankCode(ab_acc); bankcode = AB_AccountSpec_GetBankCode(ab_acc);
subAccountId = AB_AccountSpec_GetSubAccountNumber(ab_acc); subAccountId = AB_AccountSpec_GetSubAccountNumber(ab_acc);
account_number = AB_AccountSpec_GetAccountNumber (ab_acc); account_number = AB_AccountSpec_GetAccountNumber (ab_acc);
#else
ab_bankname = AB_Account_GetBankName(ab_acc);
bankname = ab_bankname ? gnc_utf8_strip_invalid_strdup(ab_bankname) : NULL;
bankcode = AB_Account_GetBankCode(ab_acc);
subAccountId = AB_Account_GetSubAccountId(ab_acc);
account_number = AB_Account_GetAccountNumber (ab_acc);
#endif
/* Translators: Strings are 1. Bank code, 2. Bank name, /* Translators: Strings are 1. Bank code, 2. Bank name,
3. Account Number, 4. Subaccount ID */ 3. Account Number, 4. Subaccount ID */
result = g_strdup_printf(_("Bank code %s (%s), Account %s (%s)"), result = g_strdup_printf(_("Bank code %s (%s), Account %s (%s)"),
@ -593,14 +537,8 @@ update_account_list(ABInitialInfo *info)
/* Refill the list */ /* Refill the list */
gtk_list_store_clear(info->account_store); gtk_list_store_clear(info->account_store);
#ifdef AQBANKING6
if (AB_Banking_GetAccountSpecList(info->api, &acclist) >= 0 && acclist) if (AB_Banking_GetAccountSpecList(info->api, &acclist) >= 0 && acclist)
AB_AccountSpec_List_ForEach(acclist, update_account_list_acc_cb, info); AB_AccountSpec_List_ForEach(acclist, update_account_list_acc_cb, info);
#else
acclist = AB_Banking_GetAccounts(info->api);
if (acclist)
AB_Account_List2_ForEach(acclist, update_account_list_acc_cb, info);
#endif
else else
g_warning("update_account_list: Oops, account list from AB_Banking " g_warning("update_account_list: Oops, account list from AB_Banking "
"is NULL"); "is NULL");
@ -639,11 +577,7 @@ clear_line_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
gtk_tree_model_get(model, iter, ACCOUNT_LIST_COL_AB_ACCT, &ab_acc, -1); gtk_tree_model_get(model, iter, ACCOUNT_LIST_COL_AB_ACCT, &ab_acc, -1);
#ifdef AQBANKING6
if (aai_ab_account_equal(ab_acc, data->ab_acc)) if (aai_ab_account_equal(ab_acc, data->ab_acc))
#else
if (ab_acc == data->ab_acc)
#endif
{ {
gtk_list_store_set(store, iter, ACCOUNT_LIST_COL_GNC_NAME, "", gtk_list_store_set(store, iter, ACCOUNT_LIST_COL_GNC_NAME, "",
ACCOUNT_LIST_COL_CHECKED, TRUE, -1); ACCOUNT_LIST_COL_CHECKED, TRUE, -1);
@ -682,11 +616,7 @@ account_list_clicked_cb (GtkTreeView *view, GtkTreePath *path,
old_value = g_hash_table_lookup(info->gnc_hash, ab_acc); old_value = g_hash_table_lookup(info->gnc_hash, ab_acc);
longname = ab_account_longname(ab_acc); longname = ab_account_longname(ab_acc);
#ifdef AQBANKING6
currency = AB_AccountSpec_GetCurrency(ab_acc); currency = AB_AccountSpec_GetCurrency(ab_acc);
#else
currency = AB_Account_GetCurrency(ab_acc);
#endif
if (currency && *currency) if (currency && *currency)
{ {
commodity = gnc_commodity_table_lookup( commodity = gnc_commodity_table_lookup(
@ -753,51 +683,35 @@ save_kvp_acc_cb(gpointer key, gpointer value, gpointer user_data)
guint32 ab_account_uid; guint32 ab_account_uid;
const gchar *ab_accountid, *gnc_accountid; const gchar *ab_accountid, *gnc_accountid;
const gchar *ab_bankcode, *gnc_bankcode; const gchar *ab_bankcode, *gnc_bankcode;
#ifdef AQBANKING6
gchar *ab_online_id; gchar *ab_online_id;
gchar *gnc_online_id; gchar *gnc_online_id;
#endif
g_return_if_fail(ab_acc && gnc_acc); g_return_if_fail(ab_acc && gnc_acc);
#ifdef AQBANKING6
ab_account_uid = AB_AccountSpec_GetUniqueId(ab_acc); ab_account_uid = AB_AccountSpec_GetUniqueId(ab_acc);
#else
ab_account_uid = AB_Account_GetUniqueId(ab_acc);
#endif
if (gnc_ab_get_account_uid(gnc_acc) != ab_account_uid) if (gnc_ab_get_account_uid(gnc_acc) != ab_account_uid)
gnc_ab_set_account_uid(gnc_acc, ab_account_uid); gnc_ab_set_account_uid(gnc_acc, ab_account_uid);
#ifdef AQBANKING6
ab_accountid = AB_AccountSpec_GetAccountNumber(ab_acc); ab_accountid = AB_AccountSpec_GetAccountNumber(ab_acc);
#else
ab_accountid = AB_Account_GetAccountNumber(ab_acc);
#endif
gnc_accountid = gnc_ab_get_account_accountid(gnc_acc); gnc_accountid = gnc_ab_get_account_accountid(gnc_acc);
if (ab_accountid if (ab_accountid
&& (!gnc_accountid && (!gnc_accountid
|| (strcmp(ab_accountid, gnc_accountid) != 0))) || (strcmp(ab_accountid, gnc_accountid) != 0)))
gnc_ab_set_account_accountid(gnc_acc, ab_accountid); gnc_ab_set_account_accountid(gnc_acc, ab_accountid);
#ifdef AQBANKING6
ab_bankcode = AB_AccountSpec_GetBankCode(ab_acc); ab_bankcode = AB_AccountSpec_GetBankCode(ab_acc);
#else
ab_bankcode = AB_Account_GetBankCode(ab_acc);
#endif
gnc_bankcode = gnc_ab_get_account_bankcode(gnc_acc); gnc_bankcode = gnc_ab_get_account_bankcode(gnc_acc);
if (ab_bankcode if (ab_bankcode
&& (!gnc_bankcode && (!gnc_bankcode
|| (strcmp(gnc_bankcode, ab_bankcode) != 0))) || (strcmp(gnc_bankcode, ab_bankcode) != 0)))
gnc_ab_set_account_bankcode(gnc_acc, ab_bankcode); gnc_ab_set_account_bankcode(gnc_acc, ab_bankcode);
#ifdef AQBANKING6
ab_online_id = gnc_ab_create_online_id(ab_bankcode, ab_accountid); ab_online_id = gnc_ab_create_online_id(ab_bankcode, ab_accountid);
gnc_online_id = gnc_import_get_acc_online_id(gnc_acc); gnc_online_id = gnc_import_get_acc_online_id(gnc_acc);
if (ab_online_id && (!gnc_online_id || (strcmp(ab_online_id, gnc_online_id) != 0))) if (ab_online_id && (!gnc_online_id || (strcmp(ab_online_id, gnc_online_id) != 0)))
gnc_import_set_acc_online_id(gnc_acc, ab_online_id); gnc_import_set_acc_online_id(gnc_acc, ab_online_id);
g_free(ab_online_id); g_free(ab_online_id);
g_free (gnc_online_id); g_free (gnc_online_id);
#endif
} }
static void static void

88
gnucash/import-export/aqb/dialog-ab-trans.c
View File

@ -32,16 +32,8 @@
#include <config.h> #include <config.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "gnc-ab-utils.h" /* for AQBANKING6 */ #include "gnc-ab-utils.h"
#ifdef AQBANKING6 #include <aqbanking/types/transaction.h>
# include <aqbanking/types/transaction.h>
#else
# include <aqbanking/jobsingletransfer.h>
# include <aqbanking/jobsingledebitnote.h>
# include <aqbanking/jobinternaltransfer.h>
# include <aqbanking/jobsepatransfer.h>
# include <aqbanking/jobsepadebitnote.h>
#endif
#include <gnc-aqbanking-templates.h> #include <gnc-aqbanking-templates.h>
#include "dialog-ab-trans.h" #include "dialog-ab-trans.h"
@ -189,11 +181,7 @@ gnc_ab_trans_dialog_fill_values(GncABTransDialog *td)
AB_TRANSACTION *trans = AB_Transaction_new(); AB_TRANSACTION *trans = AB_Transaction_new();
AB_VALUE *value; AB_VALUE *value;
#ifdef AQBANKING6
AB_Banking_FillTransactionFromAccountSpec(trans, td->ab_acc); AB_Banking_FillTransactionFromAccountSpec(trans, td->ab_acc);
#else
AB_Transaction_FillLocalFromAccount(trans, td->ab_acc);
#endif
if (gnc_ab_trans_isSEPA(td->trans_type)) if (gnc_ab_trans_isSEPA(td->trans_type))
{ {
@ -212,7 +200,6 @@ gnc_ab_trans_dialog_fill_values(GncABTransDialog *td)
trans, gtk_entry_get_text(GTK_ENTRY(td->recp_account_entry))); trans, gtk_entry_get_text(GTK_ENTRY(td->recp_account_entry)));
} }
AB_Transaction_SetRemoteCountry(trans, "DE"); AB_Transaction_SetRemoteCountry(trans, "DE");
#ifdef AQBANKING6
AB_Transaction_SetRemoteName( AB_Transaction_SetRemoteName(
trans, gtk_entry_get_text(GTK_ENTRY(td->recp_name_entry))); trans, gtk_entry_get_text(GTK_ENTRY(td->recp_name_entry)));
@ -222,19 +209,6 @@ gnc_ab_trans_dialog_fill_values(GncABTransDialog *td)
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont_entry))); trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont_entry)));
AB_Transaction_AddPurposeLine( AB_Transaction_AddPurposeLine(
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont2_entry))); trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont2_entry)));
#else
AB_Transaction_AddRemoteName(
trans, gtk_entry_get_text(GTK_ENTRY(td->recp_name_entry)), FALSE);
AB_Transaction_AddPurpose(
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_entry)), FALSE);
AB_Transaction_AddPurpose(
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont_entry)), FALSE);
AB_Transaction_AddPurpose(
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont2_entry)), FALSE);
AB_Transaction_AddPurpose(
trans, gtk_entry_get_text(GTK_ENTRY(td->purpose_cont3_entry)), FALSE);
#endif
value = AB_Value_fromDouble(gnc_amount_edit_get_damount( value = AB_Value_fromDouble(gnc_amount_edit_get_damount(
GNC_AMOUNT_EDIT(td->amount_edit))); GNC_AMOUNT_EDIT(td->amount_edit)));
/* FIXME: Replace "EUR" by account-dependent string here. */ /* FIXME: Replace "EUR" by account-dependent string here. */
@ -294,23 +268,12 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, GNC_AB_ACCOUNT_SPEC *ab_acc,
g_return_val_if_fail(ab_acc, NULL); g_return_val_if_fail(ab_acc, NULL);
#ifdef AQBANKING6
ab_ownername = AB_AccountSpec_GetOwnerName(ab_acc); ab_ownername = AB_AccountSpec_GetOwnerName(ab_acc);
if (!ab_ownername) if (!ab_ownername)
ab_ownername = ""; ab_ownername = "";
ab_accountnumber = AB_AccountSpec_GetAccountNumber(ab_acc); ab_accountnumber = AB_AccountSpec_GetAccountNumber(ab_acc);
ab_bankcode = AB_AccountSpec_GetBankCode(ab_acc); ab_bankcode = AB_AccountSpec_GetBankCode(ab_acc);
ab_bankname = _("(unknown)"); ab_bankname = _("(unknown)");
#else
ab_ownername = AB_Account_GetOwnerName(ab_acc);
if (!ab_ownername)
ab_ownername = "";
ab_accountnumber = AB_Account_GetAccountNumber(ab_acc);
ab_bankcode = AB_Account_GetBankCode(ab_acc);
ab_bankname = AB_Account_GetBankName(ab_acc);
if (!ab_bankname || !*ab_bankname)
ab_bankname = _("(unknown)");
#endif
td = g_new0(GncABTransDialog, 1); td = g_new0(GncABTransDialog, 1);
td->parent = parent; td->parent = parent;
@ -474,13 +437,8 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, GNC_AB_ACCOUNT_SPEC *ab_acc,
if (gnc_ab_trans_isSEPA(trans_type)) if (gnc_ab_trans_isSEPA(trans_type))
{ {
gtk_widget_set_sensitive(GTK_WIDGET(td->orig_name_entry), TRUE); gtk_widget_set_sensitive(GTK_WIDGET(td->orig_name_entry), TRUE);
#if AQBANKING6
ab_accountnumber = AB_AccountSpec_GetIban(ab_acc); ab_accountnumber = AB_AccountSpec_GetIban(ab_acc);
ab_bankcode = AB_AccountSpec_GetBic(ab_acc); ab_bankcode = AB_AccountSpec_GetBic(ab_acc);
#else
ab_accountnumber = AB_Account_GetIBAN(ab_acc);
ab_bankcode = AB_Account_GetBIC(ab_acc);
#endif
gtk_label_set_text(GTK_LABEL(orig_account_label), ab_accountnumber); gtk_label_set_text(GTK_LABEL(orig_account_label), ab_accountnumber);
gtk_label_set_text (GTK_LABEL (orig_bankcode_label), ab_bankcode); gtk_label_set_text (GTK_LABEL (orig_bankcode_label), ab_bankcode);
} }
@ -711,11 +669,7 @@ gnc_ab_trans_dialog_run_until_ok(GncABTransDialog *td)
} }
/* Activate as many purpose entries as available for the job */ /* Activate as many purpose entries as available for the job */
#ifdef AQBANKING6
joblimits = AB_AccountSpec_GetTransactionLimitsForCommand(td->ab_acc, AB_Transaction_GetCommand(job)); joblimits = AB_AccountSpec_GetTransactionLimitsForCommand(td->ab_acc, AB_Transaction_GetCommand(job));
#else
joblimits = AB_Job_GetFieldLimits (job);
#endif
max_purpose_lines = joblimits ? max_purpose_lines = joblimits ?
AB_TransactionLimits_GetMaxLinesPurpose(joblimits) : 2; AB_TransactionLimits_GetMaxLinesPurpose(joblimits) : 2;
gtk_widget_set_sensitive(td->purpose_cont_entry, max_purpose_lines > 1); gtk_widget_set_sensitive(td->purpose_cont_entry, max_purpose_lines > 1);
@ -855,7 +809,6 @@ static GNC_AB_JOB *
gnc_ab_trans_dialog_get_available_empty_job(GNC_AB_ACCOUNT_SPEC *ab_acc, GncABTransType trans_type) gnc_ab_trans_dialog_get_available_empty_job(GNC_AB_ACCOUNT_SPEC *ab_acc, GncABTransType trans_type)
{ {
GNC_AB_JOB *job; GNC_AB_JOB *job;
#ifdef AQBANKING6
AB_TRANSACTION_COMMAND cmd = AB_Transaction_CommandUnknown; AB_TRANSACTION_COMMAND cmd = AB_Transaction_CommandUnknown;
switch (trans_type) switch (trans_type)
@ -869,11 +822,9 @@ gnc_ab_trans_dialog_get_available_empty_job(GNC_AB_ACCOUNT_SPEC *ab_acc, GncABTr
case SEPA_TRANSFER: case SEPA_TRANSFER:
cmd=AB_Transaction_CommandSepaTransfer; cmd=AB_Transaction_CommandSepaTransfer;
break; break;
#if (AQBANKING_VERSION_INT >= 60400)
case SEPA_INTERNAL_TRANSFER: case SEPA_INTERNAL_TRANSFER:
cmd=AB_Transaction_CommandSepaInternalTransfer; cmd=AB_Transaction_CommandSepaInternalTransfer;
break; break;
#endif
case SEPA_DEBITNOTE: case SEPA_DEBITNOTE:
cmd=AB_Transaction_CommandSepaDebitNote; cmd=AB_Transaction_CommandSepaDebitNote;
break; break;
@ -887,32 +838,6 @@ gnc_ab_trans_dialog_get_available_empty_job(GNC_AB_ACCOUNT_SPEC *ab_acc, GncABTr
job = AB_Transaction_new(); job = AB_Transaction_new();
AB_Transaction_SetCommand(job, cmd); AB_Transaction_SetCommand(job, cmd);
AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc)); AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc));
#else
switch (trans_type)
{
case SINGLE_DEBITNOTE:
job = AB_JobSingleDebitNote_new(ab_acc);
break;
case SINGLE_INTERNAL_TRANSFER:
job = AB_JobInternalTransfer_new(ab_acc);
break;
case SINGLE_TRANSFER:
job = AB_JobSingleTransfer_new(ab_acc);
break;
case SEPA_DEBITNOTE:
job = AB_JobSepaDebitNote_new(ab_acc);
break;
case SEPA_TRANSFER:
default:
job = AB_JobSepaTransfer_new(ab_acc);
break;
};
if (!job || AB_Job_CheckAvailability(job))
{
if (job) AB_Job_free(job);
return NULL;
}
#endif
return job; return job;
} }
@ -932,7 +857,6 @@ gnc_ab_get_trans_job(GNC_AB_ACCOUNT_SPEC *ab_acc,
g_return_val_if_fail(ab_acc && ab_trans, NULL); g_return_val_if_fail(ab_acc && ab_trans, NULL);
#ifdef AQBANKING6
job = gnc_ab_trans_dialog_get_available_empty_job(ab_acc, trans_type); job = gnc_ab_trans_dialog_get_available_empty_job(ab_acc, trans_type);
if (job) if (job)
{ {
@ -949,14 +873,6 @@ gnc_ab_get_trans_job(GNC_AB_ACCOUNT_SPEC *ab_acc,
} }
return NULL; return NULL;
#else
job = gnc_ab_trans_dialog_get_available_empty_job(ab_acc, trans_type);
if (job)
{
AB_Job_SetTransaction(job, ab_trans);
}
return job;
#endif
} }
void void

48
gnucash/import-export/aqb/gnc-ab-getbalance.c
View File

@ -33,11 +33,7 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <aqbanking/banking.h> #include <aqbanking/banking.h>
#ifdef AQBANKING6
# include <aqbanking/types/transaction.h> # include <aqbanking/types/transaction.h>
#else
#include <aqbanking/jobgetbalance.h>
#endif
#include "gnc-ab-getbalance.h" #include "gnc-ab-getbalance.h"
#include "gnc-ab-kvp.h" #include "gnc-ab-kvp.h"
@ -70,14 +66,6 @@ gnc_ab_getbalance(GtkWidget *parent, Account *gnc_acc)
return; return;
} }
#ifndef AQBANKING6
if (AB_Banking_OnlineInit(api) != 0)
{
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
online = TRUE;
#endif
/* Get the AqBanking Account */ /* Get the AqBanking Account */
ab_acc = gnc_ab_get_ab_account(api, gnc_acc); ab_acc = gnc_ab_get_ab_account(api, gnc_acc);
if (!ab_acc) if (!ab_acc)
@ -88,29 +76,19 @@ gnc_ab_getbalance(GtkWidget *parent, Account *gnc_acc)
} }
/* Get a GetBalance job and enqueue it */ /* Get a GetBalance job and enqueue it */
#ifdef AQBANKING6
if (!AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_CommandGetBalance)) if (!AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_CommandGetBalance))
#else
job = AB_JobGetBalance_new(ab_acc);
if (!job || AB_Job_CheckAvailability(job))
#endif
{ {
g_warning("gnc_ab_getbalance: JobGetBalance not available for this " g_warning("gnc_ab_getbalance: JobGetBalance not available for this "
"account"); "account");
gnc_error_dialog (GTK_WINDOW (parent), _("Online action \"Get Balance\" not available for this account.")); gnc_error_dialog (GTK_WINDOW (parent), _("Online action \"Get Balance\" not available for this account."));
goto cleanup; goto cleanup;
} }
#ifdef AQBANKING6
job = AB_Transaction_new(); job = AB_Transaction_new();
AB_Transaction_SetCommand(job, AB_Transaction_CommandGetBalance); AB_Transaction_SetCommand(job, AB_Transaction_CommandGetBalance);
AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc)); AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc));
job_list = AB_Transaction_List2_new(); job_list = AB_Transaction_List2_new();
AB_Transaction_List2_PushBack(job_list, job); AB_Transaction_List2_PushBack(job_list, job);
#else
job_list = AB_Job_List2_new();
AB_Job_List2_PushBack(job_list, job);
#endif
/* Get a GUI object */ /* Get a GUI object */
gui = gnc_GWEN_Gui_get(parent); gui = gnc_GWEN_Gui_get(parent);
if (!gui) if (!gui)
@ -123,38 +101,21 @@ gnc_ab_getbalance(GtkWidget *parent, Account *gnc_acc)
context = AB_ImExporterContext_new(); context = AB_ImExporterContext_new();
/* Execute the job */ /* Execute the job */
#ifdef AQBANKING6
AB_Banking_SendCommands(api, job_list, context); AB_Banking_SendCommands(api, job_list, context);
#else
AB_Banking_ExecuteJobs(api, job_list, context);
#endif
/* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
* status always describes better whether the job was actually * status always describes better whether the job was actually
* transferred to and accepted by the bank. See also * transferred to and accepted by the bank. See also
* https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
*/ */
#ifdef AQBANKING6
job_status = AB_Transaction_GetStatus(job); job_status = AB_Transaction_GetStatus(job);
if (job_status != AB_Transaction_StatusEnqueued if (job_status != AB_Transaction_StatusEnqueued
&& job_status != AB_Transaction_StatusPending && job_status != AB_Transaction_StatusPending
&& job_status != AB_Transaction_StatusAccepted) && job_status != AB_Transaction_StatusAccepted)
#else
job_status = AB_Job_GetStatus(job);
if (job_status != AB_Job_StatusFinished
&& job_status != AB_Job_StatusPending)
#endif
{ {
g_warning("gnc_ab_getbalance: Error on executing job: %d", job_status); g_warning("gnc_ab_getbalance: Error on executing job: %d", job_status);
#ifdef AQBANKING6
gnc_error_dialog (GTK_WINDOW (parent), gnc_error_dialog (GTK_WINDOW (parent),
_("Error on executing job.\n\nStatus: %s"), _("Error on executing job.\n\nStatus: %s"),
AB_Transaction_Status_toString(job_status)); AB_Transaction_Status_toString(job_status));
#else
gnc_error_dialog (GTK_WINDOW (parent),
_("Error on executing job.\n\nStatus: %s - %s"),
AB_Job_Status2Char(job_status),
AB_Job_GetResultText(job));
#endif
goto cleanup; goto cleanup;
} }
@ -168,18 +129,9 @@ cleanup:
AB_ImExporterContext_free(context); AB_ImExporterContext_free(context);
if (gui) if (gui)
gnc_GWEN_Gui_release(gui); gnc_GWEN_Gui_release(gui);
#ifdef AQBANKING6
if (job_list) if (job_list)
AB_Transaction_List2_free(job_list); AB_Transaction_List2_free(job_list);
if (job) if (job)
AB_Transaction_free(job); AB_Transaction_free(job);
#else
if (job_list)
AB_Job_List2_free(job_list);
if (job)
AB_Job_free(job);
if (online)
AB_Banking_OnlineFini(api);
#endif
gnc_AB_BANKING_fini(api); gnc_AB_BANKING_fini(api);
} }

54
gnucash/import-export/aqb/gnc-ab-gettrans.c
View File

@ -33,11 +33,7 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <aqbanking/banking.h> #include <aqbanking/banking.h>
#ifdef AQBANKING6
# include <aqbanking/types/transaction.h> # include <aqbanking/types/transaction.h>
#else
# include <aqbanking/jobgettransactions.h>
#endif
#include "Account.h" #include "Account.h"
#include "dialog-ab-daterange.h" #include "dialog-ab-daterange.h"
#include "gnc-ab-gettrans.h" #include "gnc-ab-gettrans.h"
@ -121,14 +117,6 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
g_warning("gnc_ab_gettrans: Couldn't get AqBanking API"); g_warning("gnc_ab_gettrans: Couldn't get AqBanking API");
return; return;
} }
#ifndef AQBANKING6
if (AB_Banking_OnlineInit(api) != 0)
{
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
online = TRUE;
#endif
/* Get the AqBanking Account */ /* Get the AqBanking Account */
ab_acc = gnc_ab_get_ab_account(api, gnc_acc); ab_acc = gnc_ab_get_ab_account(api, gnc_acc);
if (!ab_acc) if (!ab_acc)
@ -148,19 +136,13 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
until = GWEN_Time_toTime_t(to_date); until = GWEN_Time_toTime_t(to_date);
/* Get a GetTransactions job and enqueue it */ /* Get a GetTransactions job and enqueue it */
#ifdef AQBANKING6
if (!AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_CommandGetTransactions)) if (!AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_CommandGetTransactions))
#else
job = AB_JobGetTransactions_new(ab_acc);
if (!job || AB_Job_CheckAvailability(job))
#endif
{ {
g_warning("gnc_ab_gettrans: JobGetTransactions not available for this " g_warning("gnc_ab_gettrans: JobGetTransactions not available for this "
"account"); "account");
gnc_error_dialog (GTK_WINDOW (parent), _("Online action \"Get Transactions\" not available for this account.")); gnc_error_dialog (GTK_WINDOW (parent), _("Online action \"Get Transactions\" not available for this account."));
goto cleanup; goto cleanup;
} }
#ifdef AQBANKING6
job = AB_Transaction_new(); job = AB_Transaction_new();
AB_Transaction_SetCommand(job, AB_Transaction_CommandGetTransactions); AB_Transaction_SetCommand(job, AB_Transaction_CommandGetTransactions);
AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc)); AB_Transaction_SetUniqueAccountId(job, AB_AccountSpec_GetUniqueId(ab_acc));
@ -185,12 +167,6 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
job_list = AB_Transaction_List2_new(); job_list = AB_Transaction_List2_new();
AB_Transaction_List2_PushBack(job_list, job); AB_Transaction_List2_PushBack(job_list, job);
#else
AB_JobGetTransactions_SetFromTime(job, from_date);
AB_JobGetTransactions_SetToTime(job, to_date);
job_list = AB_Job_List2_new();
AB_Job_List2_PushBack(job_list, job);
#endif
/* Get a GUI object */ /* Get a GUI object */
gui = gnc_GWEN_Gui_get(parent); gui = gnc_GWEN_Gui_get(parent);
if (!gui) if (!gui)
@ -203,38 +179,22 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
context = AB_ImExporterContext_new(); context = AB_ImExporterContext_new();
/* Execute the job */ /* Execute the job */
#ifdef AQBANKING6
AB_Banking_SendCommands(api, job_list, context); AB_Banking_SendCommands(api, job_list, context);
#else
AB_Banking_ExecuteJobs(api, job_list, context);
#endif
/* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
* status always describes better whether the job was actually * status always describes better whether the job was actually
* transferred to and accepted by the bank. See also * transferred to and accepted by the bank. See also
* https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
*/ */
#ifdef AQBANKING6
job_status = AB_Transaction_GetStatus(job); job_status = AB_Transaction_GetStatus(job);
if (job_status != AB_Transaction_StatusAccepted if (job_status != AB_Transaction_StatusAccepted
&& job_status != AB_Transaction_StatusPending) && job_status != AB_Transaction_StatusPending)
#else
job_status = AB_Job_GetStatus(job);
if (job_status != AB_Job_StatusFinished
&& job_status != AB_Job_StatusPending)
#endif
{ {
g_warning("gnc_ab_gettrans: Error on executing job"); g_warning("gnc_ab_gettrans: Error on executing job");
#ifdef AQBANKING6
gnc_error_dialog (GTK_WINDOW (parent), gnc_error_dialog (GTK_WINDOW (parent),
_("Error on executing job.\n\nStatus: %s (%d)"), _("Error on executing job.\n\nStatus: %s (%d)"),
AB_Transaction_Status_toString(job_status), AB_Transaction_Status_toString(job_status),
job_status); job_status);
#else
gnc_error_dialog (GTK_WINDOW (parent),
_("Error on executing job.\n\nStatus: %s - %s"),
AB_Job_Status2Char(job_status),
AB_Job_GetResultText(job));
#endif
goto cleanup; goto cleanup;
} }
@ -267,24 +227,12 @@ cleanup:
if (gui) if (gui)
gnc_GWEN_Gui_release(gui); gnc_GWEN_Gui_release(gui);
if (job_list) if (job_list)
#ifdef AQBANKING6
AB_Transaction_List2_free(job_list); AB_Transaction_List2_free(job_list);
#else
AB_Job_List2_free(job_list);
#endif
if (job) if (job)
#ifdef AQBANKING6
AB_Transaction_free(job); AB_Transaction_free(job);
#else
AB_Job_free(job);
#endif
if (to_date) if (to_date)
GWEN_Time_free(to_date); GWEN_Time_free(to_date);
if (from_date) if (from_date)
GWEN_Time_free(from_date); GWEN_Time_free(from_date);
#ifndef AQBANKING6
if (online)
AB_Banking_OnlineFini(api);
#endif
gnc_AB_BANKING_fini(api); gnc_AB_BANKING_fini(api);
} }

55
gnucash/import-export/aqb/gnc-ab-transfer.c
View File

@ -97,14 +97,6 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
g_warning("gnc_ab_maketrans: Couldn't get AqBanking API"); g_warning("gnc_ab_maketrans: Couldn't get AqBanking API");
return; return;
} }
#ifndef AQBANKING6
if (AB_Banking_OnlineInit(api) != 0)
{
g_warning("gnc_ab_maketrans: Couldn't initialize AqBanking API");
goto cleanup;
}
online = TRUE;
#endif
/* Get the AqBanking Account */ /* Get the AqBanking Account */
ab_acc = gnc_ab_get_ab_account(api, gnc_acc); ab_acc = gnc_ab_get_ab_account(api, gnc_acc);
if (!ab_acc) if (!ab_acc)
@ -114,7 +106,6 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
goto cleanup; goto cleanup;
} }
#if (AQBANKING_VERSION_INT >= 60400)
if (trans_type == SEPA_INTERNAL_TRANSFER) if (trans_type == SEPA_INTERNAL_TRANSFER)
{ {
/* Generate list of template transactions from the reference accounts*/ /* Generate list of template transactions from the reference accounts*/
@ -127,7 +118,6 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
} }
} }
else else
#endif
{ {
/* Get list of template transactions */ /* Get list of template transactions */
templates = gnc_ab_trans_templ_list_new_from_book( templates = gnc_ab_trans_templ_list_new_from_book(
@ -158,26 +148,12 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
GNC_AB_JOB_STATUS job_status; GNC_AB_JOB_STATUS job_status;
GncABImExContextImport *ieci = NULL; GncABImExContextImport *ieci = NULL;
#ifndef AQBANKING6
/* Get a GUI object */
gui = gnc_GWEN_Gui_get(parent);
if (!gui)
{
g_warning("gnc_ab_maketrans: Couldn't initialize Gwenhywfar GUI");
aborted = TRUE;
goto repeat;
}
#endif
/* Let the user enter the values */ /* Let the user enter the values */
result = gnc_ab_trans_dialog_run_until_ok(td); result = gnc_ab_trans_dialog_run_until_ok(td);
templates = gnc_ab_trans_dialog_get_templ(td, &changed); templates = gnc_ab_trans_dialog_get_templ(td, &changed);
#if (AQBANKING_VERSION_INT >= 60400)
if (trans_type != SEPA_INTERNAL_TRANSFER && changed) if (trans_type != SEPA_INTERNAL_TRANSFER && changed)
#else
if (changed)
#endif
{ {
/* Save the templates */ /* Save the templates */
save_templates(parent, gnc_acc, templates, save_templates(parent, gnc_acc, templates,
@ -195,11 +171,7 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
/* Get a job and enqueue it */ /* Get a job and enqueue it */
ab_trans = gnc_ab_trans_dialog_get_ab_trans(td); ab_trans = gnc_ab_trans_dialog_get_ab_trans(td);
job = gnc_ab_trans_dialog_get_job(td); job = gnc_ab_trans_dialog_get_job(td);
#ifdef AQBANKING6
if (!job || AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_GetCommand(job))==NULL) if (!job || AB_AccountSpec_GetTransactionLimitsForCommand(ab_acc, AB_Transaction_GetCommand(job))==NULL)
#else
if (!job || AB_Job_CheckAvailability(job))
#endif
{ {
if (!gnc_verify_dialog ( if (!gnc_verify_dialog (
GTK_WINDOW (parent), FALSE, "%s", GTK_WINDOW (parent), FALSE, "%s",
@ -215,13 +187,8 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
aborted = TRUE; aborted = TRUE;
goto repeat; goto repeat;
} }
#ifdef AQBANKING6
job_list = AB_Transaction_List2_new(); job_list = AB_Transaction_List2_new();
AB_Transaction_List2_PushBack(job_list, job); AB_Transaction_List2_PushBack(job_list, job);
#else
job_list = AB_Job_List2_new();
AB_Job_List2_PushBack(job_list, job);
#endif
/* Setup a Transfer Dialog for the GnuCash transaction */ /* Setup a Transfer Dialog for the GnuCash transaction */
xfer_dialog = gnc_xfer_dialog(gnc_ab_trans_dialog_get_parent(td), xfer_dialog = gnc_xfer_dialog(gnc_ab_trans_dialog_get_parent(td),
gnc_acc); gnc_acc);
@ -305,25 +272,15 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
} }
/* Finally, execute the job */ /* Finally, execute the job */
#ifdef AQBANKING6
AB_Banking_SendCommands(api, job_list, context); AB_Banking_SendCommands(api, job_list, context);
#else
AB_Banking_ExecuteJobs(api, job_list, context);
#endif
/* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
* status always describes better whether the job was actually * status always describes better whether the job was actually
* transferred to and accepted by the bank. See also * transferred to and accepted by the bank. See also
* https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
*/ */
#ifdef AQBANKING6
job_status = AB_Transaction_GetStatus(job); job_status = AB_Transaction_GetStatus(job);
if (job_status != AB_Transaction_StatusAccepted if (job_status != AB_Transaction_StatusAccepted
&& job_status != AB_Transaction_StatusPending) && job_status != AB_Transaction_StatusPending)
#else
job_status = AB_Job_GetStatus(job);
if (job_status != AB_Job_StatusFinished
&& job_status != AB_Job_StatusPending)
#endif
{ {
successful = FALSE; successful = FALSE;
if (!gnc_verify_dialog ( if (!gnc_verify_dialog (
@ -364,20 +321,12 @@ repeat:
AB_ImExporterContext_free(context); AB_ImExporterContext_free(context);
if (job_list) if (job_list)
{ {
#ifdef AQBANKING6
AB_Transaction_List2_free(job_list); AB_Transaction_List2_free(job_list);
#else
AB_Job_List2_free(job_list);
#endif
job_list = NULL; job_list = NULL;
} }
if (job) if (job)
{ {
#ifdef AQBANKING6
AB_Transaction_free(job); AB_Transaction_free(job);
#else
AB_Job_free(job);
#endif
job = NULL; job = NULL;
} }
if (gui) if (gui)
@ -392,9 +341,5 @@ repeat:
cleanup: cleanup:
if (td) if (td)
gnc_ab_trans_dialog_free(td); gnc_ab_trans_dialog_free(td);
#ifndef AQBANKING6
if (online)
AB_Banking_OnlineFini(api);
#endif
gnc_AB_BANKING_fini(api); gnc_AB_BANKING_fini(api);
} }

199
gnucash/import-export/aqb/gnc-ab-utils.c
View File

@ -34,13 +34,9 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gwenhywfar/gwenhywfar.h> #include <gwenhywfar/gwenhywfar.h>
#include <aqbanking/banking.h> #include <aqbanking/banking.h>
#ifdef AQBANKING6
#include <aqbanking/types/balance.h> #include <aqbanking/types/balance.h>
#if (AQBANKING_VERSION_INT >= 60400)
#include <aqbanking/types/refaccount.h> #include <aqbanking/types/refaccount.h>
#include <gnc-aqbanking-templates.h> #include <gnc-aqbanking-templates.h>
#endif
#endif
#include "window-reconcile.h" #include "window-reconcile.h"
#include "Transaction.h" #include "Transaction.h"
#include "dialog-ab-trans.h" #include "dialog-ab-trans.h"
@ -54,11 +50,7 @@
#include "import-utilities.h" #include "import-utilities.h"
#include "qof.h" #include "qof.h"
#include "engine-helpers.h" #include "engine-helpers.h"
#ifdef AQBANKING6 #include <aqbanking/gui/abgui.h>
# include <aqbanking/gui/abgui.h>
#else
# include <aqbanking/abgui.h>
#endif
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN; G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
@ -101,7 +93,6 @@ static inline gboolean is_leap_year (int year)
static inline time64 static inline time64
gnc_gwen_date_to_time64 (const GNC_GWEN_DATE* date) gnc_gwen_date_to_time64 (const GNC_GWEN_DATE* date)
{ {
#if AQBANKING_VERSION_INT >= 59900
int day = GWEN_Date_GetDay (date); int day = GWEN_Date_GetDay (date);
int month = GWEN_Date_GetMonth (date); int month = GWEN_Date_GetMonth (date);
int year = GWEN_Date_GetYear (date); int year = GWEN_Date_GetYear (date);
@ -114,12 +105,6 @@ gnc_gwen_date_to_time64 (const GNC_GWEN_DATE* date)
while (month == 2 && day <= 30 && day > (is_leap_year (year) ? 29 : 28)) while (month == 2 && day <= 30 && day > (is_leap_year (year) ? 29 : 28))
--day; --day;
return gnc_dmy2time64_neutral (day, month, year); return gnc_dmy2time64_neutral (day, month, year);
#else
int month, day, year;
GWEN_Time_GetBrokenDownDate (date, &day, &month, &year);
/* GWEN_Time_GetBrokenDownDate returns localtime(3) format; month is [0..11] */
return gnc_dmy2time64_neutral (day, month + 1, year);
#endif
} }
void void
@ -192,8 +177,6 @@ gnc_AB_BANKING_new (void)
api = AB_Banking_new ("gnucash", NULL, 0); api = AB_Banking_new ("gnucash", NULL, 0);
g_return_val_if_fail (api, NULL); g_return_val_if_fail (api, NULL);
#if AQBANKING_VERSION_INT >= 59925 \
|| (AQBANKING_VERSION_INT >= 50709 && AQBANKING_VERSION_INT < 59900)
/* These two values must be set because newest bank regulation requires /* These two values must be set because newest bank regulation requires
the bank servers to require it. The string itself results from our the bank servers to require it. The string itself results from our
registration with the German bank association at registration with the German bank association at
@ -202,30 +185,6 @@ gnc_AB_BANKING_new (void)
introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */ introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
AB_Banking_RuntimeConfig_SetCharValue (api, "fintsRegistrationKey", "412748A1836CDD07181CE1910"); AB_Banking_RuntimeConfig_SetCharValue (api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
AB_Banking_RuntimeConfig_SetCharValue (api, "fintsApplicationVersionString", PROJECT_VERSION); AB_Banking_RuntimeConfig_SetCharValue (api, "fintsApplicationVersionString", PROJECT_VERSION);
#endif
#ifndef AQBANKING6
/* Check for config migration */
if (AB_Banking_HasConf4 (api) != 0)
{
if (AB_Banking_HasConf3 (api) == 0)
{
PINFO("gnc_AB_BANKING_new: importing aqbanking3 configuration\n");
if (AB_Banking_ImportConf3 (api) < 0)
{
PINFO("gnc_AB_BANKING_new: unable to import aqbanking3 configuration\n");
}
}
else if (AB_Banking_HasConf2 (api) == 0)
{
PINFO("gnc_AB_BANKING_new: importing aqbanking2 configuration\n");
if (AB_Banking_ImportConf2 (api) < 0)
{
PINFO("gnc_AB_BANKING_new: unable to import aqbanking2 configuration\n");
}
}
}
#endif
/* Init the API */ /* Init the API */
g_return_val_if_fail (AB_Banking_Init (api) == 0, NULL); g_return_val_if_fail (AB_Banking_Init (api) == 0, NULL);
@ -298,7 +257,6 @@ gnc_ab_get_ab_account (const AB_BANKING *api, Account *gnc_acc)
if (account_uid > 0) if (account_uid > 0)
{ {
#ifdef AQBANKING6
gint rv; gint rv;
rv = AB_Banking_GetAccountSpecByUniqueId (api, account_uid, &ab_account); rv = AB_Banking_GetAccountSpecByUniqueId (api, account_uid, &ab_account);
@ -314,25 +272,6 @@ gnc_ab_get_ab_account (const AB_BANKING *api, Account *gnc_acc)
return NULL; return NULL;
} }
return ab_account; return ab_account;
#else
ab_account = AB_Banking_GetAccount (api, account_uid);
if (!ab_account && bankcode && *bankcode && accountid && *accountid)
{
PINFO("gnc_ab_get_ab_account: No AB_ACCOUNT found for UID %d, "
"trying bank code\n", account_uid);
ab_account = AB_Banking_GetAccountByCodeAndNumber (api, bankcode,
accountid);
}
return ab_account;
}
else if (bankcode && *bankcode && accountid && *accountid)
{
ab_account = AB_Banking_GetAccountByCodeAndNumber (api, bankcode,
accountid);
return ab_account;
#endif
} }
return NULL; return NULL;
@ -405,23 +344,14 @@ join_ab_strings_cb (const gchar *str, gpointer user_data)
gchar * gchar *
gnc_ab_get_remote_name (const AB_TRANSACTION *ab_trans) gnc_ab_get_remote_name (const AB_TRANSACTION *ab_trans)
{ {
#ifdef AQBANKING6
const char* ab_remote_name; const char* ab_remote_name;
#else
const GWEN_STRINGLIST *ab_remote_name;
#endif
gchar *gnc_other_name = NULL; gchar *gnc_other_name = NULL;
g_return_val_if_fail (ab_trans, NULL); g_return_val_if_fail (ab_trans, NULL);
ab_remote_name = AB_Transaction_GetRemoteName (ab_trans); ab_remote_name = AB_Transaction_GetRemoteName (ab_trans);
if (ab_remote_name) if (ab_remote_name)
#ifdef AQBANKING6
gnc_other_name = g_strdup(ab_remote_name); gnc_other_name = g_strdup(ab_remote_name);
#else
GWEN_StringList_ForEach (ab_remote_name, join_ab_strings_cb,
&gnc_other_name);
#endif
if (!gnc_other_name || !*gnc_other_name) if (!gnc_other_name || !*gnc_other_name)
{ {
g_free (gnc_other_name); g_free (gnc_other_name);
@ -434,13 +364,6 @@ gnc_ab_get_remote_name (const AB_TRANSACTION *ab_trans)
gchar * gchar *
gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx) gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{ {
#ifdef AQBANKING6
# if AQBANKING_VERSION_INT < 59929
# error "You are using an old beta version of aqbanking > 5.99.0 but < 5.99.29, please upgrade to the latest 5.99.29 or newer."
# endif
#else
const /* only const in aqbanking < 5.99 */
#endif
GWEN_STRINGLIST *ab_purpose; GWEN_STRINGLIST *ab_purpose;
const char *ab_transactionText = NULL; const char *ab_transactionText = NULL;
gchar *gnc_description = NULL; gchar *gnc_description = NULL;
@ -457,22 +380,12 @@ gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx)
gnc_description = g_strdup (ab_transactionText); gnc_description = g_strdup (ab_transactionText);
} }
ab_purpose = ab_purpose = AB_Transaction_GetPurposeAsStringList (ab_trans);
#ifdef AQBANKING6
/* With aqbanking-5.99.29, the identical function as before is now available under this new name. */
AB_Transaction_GetPurposeAsStringList
#else
AB_Transaction_GetPurpose
#endif
(ab_trans);
if (ab_purpose) if (ab_purpose)
GWEN_StringList_ForEach (ab_purpose, join_ab_strings_cb, GWEN_StringList_ForEach (ab_purpose, join_ab_strings_cb,
&gnc_description); &gnc_description);
#ifdef AQBANKING6
/* With aqbanking>=5.99, the return value must now be free'd */
GWEN_StringList_free (ab_purpose); GWEN_StringList_free (ab_purpose);
#endif
return gnc_description; return gnc_description;
} }
@ -487,9 +400,6 @@ static gchar *
ab_ultimate_creditor_debtor_to_gnc (const AB_TRANSACTION *ab_trans, ab_ultimate_creditor_debtor_to_gnc (const AB_TRANSACTION *ab_trans,
gboolean is_ofx) gboolean is_ofx)
{ {
#if AQBANKING_VERSION_INT < 60200
return NULL;
#else
const gchar* ultimate; const gchar* ultimate;
if (is_ofx) if (is_ofx)
@ -504,7 +414,6 @@ ab_ultimate_creditor_debtor_to_gnc (const AB_TRANSACTION *ab_trans,
return NULL; return NULL;
return g_strdup (ultimate); return g_strdup (ultimate);
#endif
} }
gchar * gchar *
@ -782,17 +691,10 @@ txn_transaction_cb (const AB_TRANSACTION *element, gpointer user_data)
/* NEW: The imported transaction has been imported into gnucash. /* NEW: The imported transaction has been imported into gnucash.
* Now also add it as a job to aqbanking */ * Now also add it as a job to aqbanking */
#ifdef AQBANKING6
AB_Transaction_SetLocalBankCode ( AB_Transaction_SetLocalBankCode (
ab_trans, AB_AccountSpec_GetBankCode (data->ab_acc)); ab_trans, AB_AccountSpec_GetBankCode (data->ab_acc));
AB_Transaction_SetLocalAccountNumber ( AB_Transaction_SetLocalAccountNumber (
ab_trans, AB_AccountSpec_GetAccountNumber (data->ab_acc)); ab_trans, AB_AccountSpec_GetAccountNumber (data->ab_acc));
#else
AB_Transaction_SetLocalBankCode (
ab_trans, AB_Account_GetBankCode (data->ab_acc));
AB_Transaction_SetLocalAccountNumber (
ab_trans, AB_Account_GetAccountNumber (data->ab_acc));
#endif
AB_Transaction_SetLocalCountry (ab_trans, "DE"); AB_Transaction_SetLocalCountry (ab_trans, "DE");
@ -805,9 +707,6 @@ txn_transaction_cb (const AB_TRANSACTION *element, gpointer user_data)
/* trans_type = SINGLE_INTERNAL_TRANSFER; /* trans_type = SINGLE_INTERNAL_TRANSFER;
* break; */ * break; */
case AB_Transaction_TypeTransfer: case AB_Transaction_TypeTransfer:
#ifndef AQBANKING6
case AB_Transaction_TypeEuTransfer:
#endif
default: default:
trans_type = SEPA_TRANSFER; trans_type = SEPA_TRANSFER;
break; break;
@ -816,11 +715,7 @@ txn_transaction_cb (const AB_TRANSACTION *element, gpointer user_data)
job = gnc_ab_get_trans_job (data->ab_acc, ab_trans, trans_type); job = gnc_ab_get_trans_job (data->ab_acc, ab_trans, trans_type);
/* Check whether we really got a job */ /* Check whether we really got a job */
#ifdef AQBANKING6
if (!job || AB_AccountSpec_GetTransactionLimitsForCommand (data->ab_acc, AB_Transaction_GetCommand (job)) == NULL) if (!job || AB_AccountSpec_GetTransactionLimitsForCommand (data->ab_acc, AB_Transaction_GetCommand (job)) == NULL)
#else
if (!job || AB_Job_CheckAvailability (job))
#endif
{ {
/* Oops, no job, probably not supported by bank */ /* Oops, no job, probably not supported by bank */
if (gnc_verify_dialog ( if (gnc_verify_dialog (
@ -843,11 +738,7 @@ txn_transaction_cb (const AB_TRANSACTION *element, gpointer user_data)
{ {
gnc_gen_trans_list_add_trans_with_ref_id (data->generic_importer, gnc_gen_trans_list_add_trans_with_ref_id (data->generic_importer,
gnc_trans, gnc_trans,
#ifdef AQBANKING6
AB_Transaction_GetUniqueId (job)); AB_Transaction_GetUniqueId (job));
#else
AB_Job_GetJobId (job));
#endif
/* AB_Job_List2_PushBack(data->job_list, job); -> delayed until trans is successfully imported */ /* AB_Job_List2_PushBack(data->job_list, job); -> delayed until trans is successfully imported */
g_datalist_set_data (&data->tmp_job_list, gnc_AB_JOB_to_readable_string (job), job); g_datalist_set_data (&data->tmp_job_list, gnc_AB_JOB_to_readable_string (job), job);
} }
@ -872,19 +763,11 @@ static void gnc_ab_trans_processed_cb (GNCImportTransInfo *trans_info,
if (imported) if (imported)
{ {
#ifdef AQBANKING6
AB_Transaction_List2_PushBack (data->job_list, job); AB_Transaction_List2_PushBack (data->job_list, job);
#else
AB_Job_List2_PushBack (data->job_list, job);
#endif
} }
else else
{ {
#ifdef AQBANKING6
AB_Transaction_free (job); AB_Transaction_free (job);
#else
AB_Job_free (job);
#endif
} }
g_datalist_remove_data (&data->tmp_job_list, jobname); g_datalist_remove_data (&data->tmp_job_list, jobname);
@ -895,11 +778,7 @@ gnc_AB_JOB_to_readable_string (const GNC_AB_JOB *job)
{ {
if (job) if (job)
{ {
#ifdef AQBANKING6
return gnc_AB_JOB_ID_to_string (AB_Transaction_GetUniqueId (job)); return gnc_AB_JOB_ID_to_string (AB_Transaction_GetUniqueId (job));
#else
return gnc_AB_JOB_ID_to_string (AB_Job_GetJobId (job));
#endif
} }
else else
{ {
@ -926,11 +805,7 @@ txn_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
/* Ignore them */ /* Ignore them */
return NULL; return NULL;
#ifdef AQBANKING6
if (!AB_ImExporterAccountInfo_GetFirstTransaction (element, AB_Transaction_TypeStatement, 0)) if (!AB_ImExporterAccountInfo_GetFirstTransaction (element, AB_Transaction_TypeStatement, 0))
#else
if (!AB_ImExporterAccountInfo_GetFirstTransaction (element))
#endif
/* No transaction found */ /* No transaction found */
return NULL; return NULL;
else else
@ -988,7 +863,6 @@ txn_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
} }
/* Iterate through all transactions */ /* Iterate through all transactions */
#ifdef AQBANKING6
{ {
AB_TRANSACTION_LIST *ab_trans_list = AB_ImExporterAccountInfo_GetTransactionList (element); AB_TRANSACTION_LIST *ab_trans_list = AB_ImExporterAccountInfo_GetTransactionList (element);
if (ab_trans_list) if (ab_trans_list)
@ -996,10 +870,6 @@ txn_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
txn_transaction_cb, data, txn_transaction_cb, data,
AB_Transaction_TypeStatement, 0); AB_Transaction_TypeStatement, 0);
} }
#else
AB_ImExporterAccountInfo_TransactionsForEach (element, txn_transaction_cb,
data);
#endif
return NULL; return NULL;
} }
@ -1015,9 +885,6 @@ bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
time64 booked_tt = 0; time64 booked_tt = 0;
GtkWidget *dialog; GtkWidget *dialog;
gboolean show_recn_window = FALSE; gboolean show_recn_window = FALSE;
#ifndef AQBANKING6
AB_ACCOUNT_STATUS *best = NULL;
#endif
g_return_val_if_fail (element && data, NULL); g_return_val_if_fail (element && data, NULL);
@ -1025,40 +892,15 @@ bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
/* Ignore them */ /* Ignore them */
return NULL; return NULL;
#ifdef AQBANKING6
if (!AB_ImExporterAccountInfo_GetFirstBalance (element)) if (!AB_ImExporterAccountInfo_GetFirstBalance (element))
#else
if (!AB_ImExporterAccountInfo_GetFirstAccountStatus (element))
#endif
/* No balance found */ /* No balance found */
return NULL; return NULL;
else else
data->awaiting |= FOUND_BALANCES; data->awaiting |= FOUND_BALANCES;
#ifdef AQBANKING6
/* Lookup the most recent BALANCE available */ /* Lookup the most recent BALANCE available */
booked_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element), booked_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element),
AB_Balance_TypeBooked); AB_Balance_TypeBooked);
#else
{
AB_ACCOUNT_STATUS *item = NULL;
const GWEN_TIME *best_time = NULL;
/* Lookup the most recent ACCOUNT_STATUS available */
item = AB_ImExporterAccountInfo_GetFirstAccountStatus (element);
while (item)
{
const GWEN_TIME *item_time = AB_AccountStatus_GetTime (item);
if (!best || GWEN_Time_Diff (best_time, item_time) < 0.0)
{
best = item;
best_time = item_time;
}
item = AB_ImExporterAccountInfo_GetNextAccountStatus (element);
}
booked_bal = AB_AccountStatus_GetBookedBalance (best);
}
#endif
if (!(data->awaiting & AWAIT_BALANCES)) if (!(data->awaiting & AWAIT_BALANCES))
{ {
@ -1092,11 +934,7 @@ bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
/* Lookup booked balance and time */ /* Lookup booked balance and time */
if (booked_bal) if (booked_bal)
{ {
#ifdef AQBANKING6
const GWEN_DATE *ti = AB_Balance_GetDate (booked_bal); const GWEN_DATE *ti = AB_Balance_GetDate (booked_bal);
#else
const GNC_GWEN_DATE *ti = AB_Balance_GetTime (booked_bal);
#endif
if (ti) if (ti)
{ {
booked_tt = gnc_gwen_date_to_time64 (ti); booked_tt = gnc_gwen_date_to_time64 (ti);
@ -1126,12 +964,8 @@ bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
} }
/* Lookup noted balance */ /* Lookup noted balance */
#ifdef AQBANKING6
noted_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element), noted_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element),
AB_Balance_TypeNoted); AB_Balance_TypeNoted);
#else
noted_bal = AB_AccountStatus_GetNotedBalance (best);
#endif
if (noted_bal) if (noted_bal)
{ {
noted_val = AB_Balance_GetValue (noted_bal); noted_val = AB_Balance_GetValue (noted_bal);
@ -1235,9 +1069,7 @@ gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
AB_BANKING *api, GtkWidget *parent) AB_BANKING *api, GtkWidget *parent)
{ {
GncABImExContextImport *data = g_new (GncABImExContextImport, 1); GncABImExContextImport *data = g_new (GncABImExContextImport, 1);
#ifdef AQBANKING6
AB_IMEXPORTER_ACCOUNTINFO_LIST *ab_ail; AB_IMEXPORTER_ACCOUNTINFO_LIST *ab_ail;
#endif
g_return_val_if_fail (context, NULL); g_return_val_if_fail (context, NULL);
/* Do not await and ignore at the same time */ /* Do not await and ignore at the same time */
g_return_val_if_fail (!(awaiting & AWAIT_BALANCES) g_return_val_if_fail (!(awaiting & AWAIT_BALANCES)
@ -1256,18 +1088,13 @@ gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
data->execute_txns = execute_txns; data->execute_txns = execute_txns;
data->api = api; data->api = api;
data->parent = parent; data->parent = parent;
#ifdef AQBANKING6
data->job_list = AB_Transaction_List2_new (); data->job_list = AB_Transaction_List2_new ();
#else
data->job_list = AB_Job_List2_new ();
#endif
data->tmp_job_list = NULL; data->tmp_job_list = NULL;
data->generic_importer = NULL; data->generic_importer = NULL;
g_datalist_init (&data->tmp_job_list); g_datalist_init (&data->tmp_job_list);
/* Import transactions */ /* Import transactions */
#ifdef AQBANKING6
ab_ail = AB_ImExporterContext_GetAccountInfoList (context); ab_ail = AB_ImExporterContext_GetAccountInfoList (context);
if (ab_ail && AB_ImExporterAccountInfo_List_GetCount (ab_ail)) if (ab_ail && AB_ImExporterAccountInfo_List_GetCount (ab_ail))
{ {
@ -1286,22 +1113,6 @@ gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
bal_accountinfo_cb, bal_accountinfo_cb,
data); data);
} }
#else
if (!(awaiting & IGNORE_TRANSACTIONS))
AB_ImExporterContext_AccountInfoForEach (context,
txn_accountinfo_cb,
data);
/* populate and display the matching window */
if (data->generic_importer)
gnc_gen_trans_list_show_all (data->generic_importer);
/* Check balances */
if (!(awaiting & IGNORE_BALANCES))
AB_ImExporterContext_AccountInfoForEach (context,
bal_accountinfo_cb,
data);
#endif
/* Check bank-messages */ /* Check bank-messages */
{ {
@ -1316,11 +1127,7 @@ gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
subject, subject,
text); text);
#ifdef AQBANKING6
bankmsg = AB_Message_List_Next (bankmsg); bankmsg = AB_Message_List_Next (bankmsg);
#else
bankmsg = AB_ImExporterContext_GetNextMessage (context); // The iterator is incremented within aqbanking
#endif
} }
} }
@ -1365,7 +1172,6 @@ gnc_ab_get_permanent_certs (void)
return perm_certs; return perm_certs;
} }
#if (AQBANKING_VERSION_INT >= 60400)
GList* GList*
gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc) gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc)
{ {
@ -1406,4 +1212,3 @@ gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc)
return retval; return retval;
} }
#endif

16
gnucash/import-export/aqb/gnc-ab-utils.h
View File

@ -52,8 +52,6 @@ G_BEGIN_DECLS
* in the interval [0..99]. */ * in the interval [0..99]. */
#define GWENHYWFAR_VERSION_INT (10000 * GWENHYWFAR_VERSION_MAJOR + 100 * GWENHYWFAR_VERSION_MINOR + GWENHYWFAR_VERSION_PATCHLEVEL) #define GWENHYWFAR_VERSION_INT (10000 * GWENHYWFAR_VERSION_MAJOR + 100 * GWENHYWFAR_VERSION_MINOR + GWENHYWFAR_VERSION_PATCHLEVEL)
#if AQBANKING_VERSION_INT >= 59900
# define AQBANKING6 1
# define GNC_AB_ACCOUNT_SPEC AB_ACCOUNT_SPEC # define GNC_AB_ACCOUNT_SPEC AB_ACCOUNT_SPEC
# define GNC_AB_ACCOUNT_SPEC_LIST AB_ACCOUNT_SPEC_LIST # define GNC_AB_ACCOUNT_SPEC_LIST AB_ACCOUNT_SPEC_LIST
# define GNC_AB_JOB AB_TRANSACTION # define GNC_AB_JOB AB_TRANSACTION
@ -61,18 +59,6 @@ G_BEGIN_DECLS
# define GNC_AB_JOB_LIST2_ITERATOR AB_TRANSACTION_LIST2_ITERATOR # define GNC_AB_JOB_LIST2_ITERATOR AB_TRANSACTION_LIST2_ITERATOR
# define GNC_AB_JOB_STATUS AB_TRANSACTION_STATUS # define GNC_AB_JOB_STATUS AB_TRANSACTION_STATUS
# define GNC_GWEN_DATE GWEN_DATE # define GNC_GWEN_DATE GWEN_DATE
#else
# define GNC_AB_ACCOUNT_SPEC AB_ACCOUNT
# define GNC_AB_ACCOUNT_SPEC_LIST AB_ACCOUNT_LIST2
# define GNC_AB_JOB AB_JOB
# define GNC_AB_JOB_LIST2 AB_JOB_LIST2
# define GNC_AB_JOB_LIST2_ITERATOR AB_JOB_LIST2_ITERATOR
# define GNC_AB_JOB_STATUS AB_JOB_STATUS
# define GNC_GWEN_DATE GWEN_TIME
#endif
#if GWENHYWFAR_VERSION_INT >= 49900
# define GWENHYWFAR5
#endif
#define GNC_PREFS_GROUP_AQBANKING "dialogs.import.hbci" #define GNC_PREFS_GROUP_AQBANKING "dialogs.import.hbci"
#define GNC_PREF_FORMAT_SWIFT940 "format-swift-mt940" #define GNC_PREF_FORMAT_SWIFT940 "format-swift-mt940"
@ -290,7 +276,6 @@ GWEN_DB_NODE *gnc_ab_get_permanent_certs (void);
gchar* gnc_ab_create_online_id (const gchar *bankcode, const gchar *accountnumber); gchar* gnc_ab_create_online_id (const gchar *bankcode, const gchar *accountnumber);
#if (AQBANKING_VERSION_INT >= 60400)
/** /**
* Obtain the list of templates based on the aqbanking account spec's target accounts. * Obtain the list of templates based on the aqbanking account spec's target accounts.
* *
@ -299,7 +284,6 @@ gchar* gnc_ab_create_online_id (const gchar *bankcode, const gchar *accountnumbe
*/ */
GList* GList*
gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc); gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc);
#endif
G_END_DECLS G_END_DECLS

140
gnucash/import-export/aqb/gnc-file-aqb-import.c
View File

@ -73,9 +73,6 @@ gnc_file_aqbanking_import(GtkWindow *parent,
AB_BANKING *api = NULL; AB_BANKING *api = NULL;
gboolean online = FALSE; gboolean online = FALSE;
GncGWENGui *gui = NULL; GncGWENGui *gui = NULL;
#ifndef AQBANKING6
AB_IMEXPORTER *importer;
#endif
GWEN_DB_NODE *db_profiles = NULL; GWEN_DB_NODE *db_profiles = NULL;
GWEN_DB_NODE *db_profile; GWEN_DB_NODE *db_profile;
AB_IMEXPORTER_CONTEXT *context = NULL; AB_IMEXPORTER_CONTEXT *context = NULL;
@ -107,14 +104,6 @@ gnc_file_aqbanking_import(GtkWindow *parent,
gnc_set_default_directory(GNC_PREFS_GROUP_AQBANKING, default_dir); gnc_set_default_directory(GNC_PREFS_GROUP_AQBANKING, default_dir);
g_free(default_dir); g_free(default_dir);
#ifndef AQBANKING6
dtaus_fd = g_open(selected_filename, O_RDONLY, 0);
if (dtaus_fd == -1)
{
DEBUG("Could not open file %s", selected_filename);
goto cleanup;
}
#endif
/* Get the API */ /* Get the API */
api = gnc_AB_BANKING_new(); api = gnc_AB_BANKING_new();
if (!api) if (!api)
@ -122,60 +111,10 @@ gnc_file_aqbanking_import(GtkWindow *parent,
g_warning("gnc_file_aqbanking_import: Couldn't get AqBanking API"); g_warning("gnc_file_aqbanking_import: Couldn't get AqBanking API");
goto cleanup; goto cleanup;
} }
#ifndef AQBANKING6
if (AB_Banking_OnlineInit(api) != 0)
{
g_warning("gnc_file_aqbanking_import: "
"Couldn't initialize AqBanking API");
goto cleanup;
}
online = TRUE;
/* Get import module */
importer = AB_Banking_GetImExporter(api, aqbanking_importername);
if (!importer)
{
g_warning("Import module %s not found", aqbanking_importername);
gnc_error_dialog(parent, "%s",
_("Import module for DTAUS import not found."));
goto cleanup;
}
/* Load the import profile */
db_profiles = AB_Banking_GetImExporterProfiles(api, aqbanking_importername);
/* Select profile */
db_profile = GWEN_DB_GetFirstGroup(db_profiles);
while (db_profile)
{
const gchar *name;
name = GWEN_DB_GetCharValue(db_profile, "name", 0, 0);
g_return_if_fail(name);
if (g_ascii_strcasecmp(name, aqbanking_profilename) == 0)
break;
db_profile = GWEN_DB_GetNextGroup(db_profile);
}
if (!db_profile)
{
g_warning("Profile \"%s\" for importer \"%s\" not found",
aqbanking_profilename, aqbanking_importername);
/* For debugging: Print those available names that have been found */
db_profile = GWEN_DB_GetFirstGroup(db_profiles);
while (db_profile)
{
const char *name = GWEN_DB_GetCharValue(db_profile, "name", 0, 0);
g_warning("Only found profile \"%s\"\n", name ? name : "(null)");
db_profile = GWEN_DB_GetNextGroup(db_profile);
}
goto cleanup;
}
#endif
/* Create a context to store the results */ /* Create a context to store the results */
context = AB_ImExporterContext_new(); context = AB_ImExporterContext_new();
#ifdef AQBANKING6
if (AB_Banking_ImportFromFileLoadProfile(api, aqbanking_importername, if (AB_Banking_ImportFromFileLoadProfile(api, aqbanking_importername,
context, aqbanking_profilename, context, aqbanking_profilename,
NULL, selected_filename) < 0) NULL, selected_filename) < 0)
@ -183,36 +122,6 @@ gnc_file_aqbanking_import(GtkWindow *parent,
g_warning("gnc_file_aqbanking_import: Error on import"); g_warning("gnc_file_aqbanking_import: Error on import");
goto cleanup; goto cleanup;
} }
#else
/* Wrap file in buffered gwen io */
close(dtaus_fd);
io = GWEN_SyncIo_File_new(selected_filename, GWEN_SyncIo_File_CreationMode_OpenExisting);
g_assert(io);
GWEN_SyncIo_AddFlags(io, GWEN_SYNCIO_FILE_FLAGS_READ);
{
/* We must explicitly call "Connect" on the GWEN_SYNCIO
* object. */
int rv = GWEN_SyncIo_Connect(io);
if (rv < 0)
{
g_warning("gnc_file_aqbanking_import: Failed to open file %s: %d", selected_filename, rv);
goto cleanup;
}
g_assert(GWEN_SyncIo_GetStatus(io) == GWEN_SyncIo_Status_Connected);
}
dtaus_fd = -1;
/* Run the import */
if (AB_ImExporter_Import(importer, context, io, db_profile))
{
g_warning("gnc_file_aqbanking_import: Error on import");
goto cleanup;
}
/* Close the file */
GWEN_SyncIo_free(io);
io = NULL;
#endif
/* Before importing the results, if this is a new book, let user specify /* Before importing the results, if this is a new book, let user specify
* book options, since they affect how transactions are created */ * book options, since they affect how transactions are created */
@ -246,11 +155,8 @@ gnc_file_aqbanking_import(GtkWindow *parent,
} }
/* And execute the jobs */ /* And execute the jobs */
#ifdef AQBANKING6
AB_Banking_SendCommands(api, job_list, execution_context); AB_Banking_SendCommands(api, job_list, execution_context);
#else
AB_Banking_ExecuteJobs(api, job_list, execution_context);
#endif
/* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
* status always describes better whether the job was actually * status always describes better whether the job was actually
* transferred to and accepted by the bank. See also * transferred to and accepted by the bank. See also
@ -261,53 +167,31 @@ gnc_file_aqbanking_import(GtkWindow *parent,
* to give the appropriate feedback if any of the jobs didn't * to give the appropriate feedback if any of the jobs didn't
* work. */ * work. */
#ifdef AQBANKING6
jit = AB_Transaction_List2_First(job_list); jit = AB_Transaction_List2_First(job_list);
#else
jit = AB_Job_List2_First(job_list);
#endif
if (jit) if (jit)
{ {
#ifdef AQBANKING6
job = AB_Transaction_List2Iterator_Data(jit); job = AB_Transaction_List2Iterator_Data(jit);
#else
job = AB_Job_List2Iterator_Data(jit);
#endif
while (job) while (job)
{ {
num_jobs += 1; num_jobs += 1;
#ifdef AQBANKING6
job_status = AB_Transaction_GetStatus(job); job_status = AB_Transaction_GetStatus(job);
if (job_status != AB_Transaction_StatusAccepted && if (job_status != AB_Transaction_StatusAccepted &&
job_status != AB_Transaction_StatusPending) job_status != AB_Transaction_StatusPending)
#else
job_status = AB_Job_GetStatus(job);
if (job_status != AB_Job_StatusFinished &&
job_status != AB_Job_StatusPending)
#endif
{ {
successful = FALSE; successful = FALSE;
num_jobs_failed += 1; num_jobs_failed += 1;
if (num_jobs_failed <= max_failures) if (num_jobs_failed <= max_failures)
{ {
#ifdef AQBANKING6
gchar *fmt_str =_("Job %d status %d - %s\n"); gchar *fmt_str =_("Job %d status %d - %s\n");
#else
gchar *fmt_str =_("Job %d status %d - %s: %s\n");
#endif
if (num_jobs_failed == 1) if (num_jobs_failed == 1)
{ {
errstr = g_string_new("Failed jobs:\n"); errstr = g_string_new("Failed jobs:\n");
} }
g_string_append_printf(errstr, fmt_str, num_jobs, g_string_append_printf(errstr, fmt_str, num_jobs,
job_status, job_status,
#ifdef AQBANKING6
AB_Transaction_Status_toString(job_status)); AB_Transaction_Status_toString(job_status));
#else
AB_Job_Status2Char(job_status),
AB_Job_GetResultText(job));
#endif
} }
else else
{ {
@ -318,17 +202,9 @@ gnc_file_aqbanking_import(GtkWindow *parent,
} }
} }
} }
#ifdef AQBANKING6
job = AB_Transaction_List2Iterator_Next(jit); job = AB_Transaction_List2Iterator_Next(jit);
#else
job = AB_Job_List2Iterator_Next(jit);
#endif
} /* while */ } /* while */
#ifdef AQBANKING6
AB_Transaction_List2Iterator_free(jit); AB_Transaction_List2Iterator_free(jit);
#else
AB_Job_List2Iterator_free(jit);
#endif
} }
if (!successful) if (!successful)
@ -364,19 +240,7 @@ gnc_file_aqbanking_import(GtkWindow *parent,
cleanup: cleanup:
if (job_list) if (job_list)
#ifdef AQBANKING6
AB_Transaction_List2_freeAll(job_list); AB_Transaction_List2_freeAll(job_list);
#else
AB_Job_List2_FreeAll(job_list);
if (io)
GWEN_SyncIo_free(io);
if (db_profiles)
GWEN_DB_Group_free(db_profiles);
if (online)
AB_Banking_OnlineFini(api);
if (dtaus_fd != -1)
close(dtaus_fd);
#endif
if (ieci) if (ieci)
g_free(ieci); g_free(ieci);
if (context) if (context)

42
gnucash/import-export/aqb/gnc-gwen-gui.c
View File

@ -110,16 +110,10 @@ static gboolean keep_alive(GncGWENGui *gui);
static void cm_close_handler(gpointer user_data); static void cm_close_handler(gpointer user_data);
static void erase_password(gchar *password); static void erase_password(gchar *password);
static gchar *strip_html(gchar *text); static gchar *strip_html(gchar *text);
#ifndef AQBANKING6
static void get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
const gchar *text, gchar **input, gint min_len,
gint max_len);
#else
static void get_input(GncGWENGui *gui, guint32 flags, const gchar *title, static void get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
const gchar *text, const char *mimeType, const gchar *text, const char *mimeType,
const char *pChallenge, uint32_t lChallenge, const char *pChallenge, uint32_t lChallenge,
gchar **input, gint min_len, gint max_len); gchar **input, gint min_len, gint max_len);
#endif
static gint GNC_GWENHYWFAR_CB messagebox_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *title, static gint GNC_GWENHYWFAR_CB messagebox_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *title,
const gchar *text, const gchar *b1, const gchar *b2, const gchar *text, const gchar *b1, const gchar *b2,
const gchar *b3, guint32 guiid); const gchar *b3, guint32 guiid);
@ -137,14 +131,6 @@ static gint GNC_GWENHYWFAR_CB progress_advance_cb(GWEN_GUI *gwen_gui, uint32_t i
static gint GNC_GWENHYWFAR_CB progress_log_cb(GWEN_GUI *gwen_gui, guint32 id, static gint GNC_GWENHYWFAR_CB progress_log_cb(GWEN_GUI *gwen_gui, guint32 id,
GWEN_LOGGER_LEVEL level, const gchar *text); GWEN_LOGGER_LEVEL level, const gchar *text);
static gint GNC_GWENHYWFAR_CB progress_end_cb(GWEN_GUI *gwen_gui, guint32 id); static gint GNC_GWENHYWFAR_CB progress_end_cb(GWEN_GUI *gwen_gui, guint32 id);
#ifndef AQBANKING6
static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags,
const gchar *token,
const gchar *title,
const gchar *text, gchar *buffer,
gint min_len, gint max_len,
guint32 guiid);
#else
static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags,
const gchar *token, const gchar *token,
const gchar *title, const gchar *title,
@ -153,7 +139,6 @@ static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags,
GWEN_GUI_PASSWORD_METHOD methodId, GWEN_GUI_PASSWORD_METHOD methodId,
GWEN_DB_NODE *methodParams, GWEN_DB_NODE *methodParams,
guint32 guiid); guint32 guiid);
#endif
static gint GNC_GWENHYWFAR_CB setpasswordstatus_cb(GWEN_GUI *gwen_gui, const gchar *token, static gint GNC_GWENHYWFAR_CB setpasswordstatus_cb(GWEN_GUI *gwen_gui, const gchar *token,
const gchar *pin, const gchar *pin,
GWEN_GUI_PASSWORD_STATUS status, guint32 guiid); GWEN_GUI_PASSWORD_STATUS status, guint32 guiid);
@ -912,15 +897,10 @@ strip_html(gchar *text)
} }
static void static void
#ifndef AQBANKING6
get_input(GncGWENGui *gui, guint32 flags, const gchar *title, const gchar *text,
gchar **input, gint min_len, gint max_len)
#else
get_input(GncGWENGui *gui, guint32 flags, const gchar *title, get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
const gchar *text, const char *mimeType, const gchar *text, const char *mimeType,
const char *pChallenge, uint32_t lChallenge, const char *pChallenge, uint32_t lChallenge,
gchar **input, gint min_len, gint max_len) gchar **input, gint min_len, gint max_len)
#endif
{ {
GtkBuilder *builder; GtkBuilder *builder;
GtkWidget *dialog; GtkWidget *dialog;
@ -968,7 +948,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_barwidth), FALSE); gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_barwidth), FALSE);
gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_delay), FALSE); gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_delay), FALSE);
#ifdef AQBANKING6
if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL) if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL)
{ {
/* Chiptan Optic (aka Flicker) */ /* Chiptan Optic (aka Flicker) */
@ -983,7 +962,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
/* Phototan or Chiptan QR */ /* Phototan or Chiptan QR */
gtk_widget_set_visible(GTK_WIDGET(optical_challenge), TRUE); gtk_widget_set_visible(GTK_WIDGET(optical_challenge), TRUE);
} }
#endif
if (is_tan) if (is_tan)
{ {
gtk_widget_hide(remember_pin_checkbutton); gtk_widget_hide(remember_pin_checkbutton);
@ -1022,7 +1000,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
g_free(raw_text); g_free(raw_text);
} }
#ifdef AQBANKING6
/* Optical challenge. Flickercode sets the mimetype to /* Optical challenge. Flickercode sets the mimetype to
* x-flickercode and doesn't set the challenge length */ * x-flickercode and doesn't set the challenge length */
if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL) if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL)
@ -1062,7 +1039,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
gtk_image_set_from_pixbuf(optical_challenge, pixbuf); gtk_image_set_from_pixbuf(optical_challenge, pixbuf);
} }
#endif
if (*input) if (*input)
{ {
@ -1199,11 +1175,7 @@ inputbox_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *title,
ENTER("gui=%p, flags=%d", gui, flags); ENTER("gui=%p, flags=%d", gui, flags);
#ifndef AQBANKING6
get_input(gui, flags, title, text, &input, min_len, max_len);
#else
get_input(gui, flags, title, text, NULL, NULL, 0, &input, min_len, max_len); get_input(gui, flags, title, text, NULL, NULL, 0, &input, min_len, max_len);
#endif
if (input) if (input)
{ {
@ -1439,31 +1411,22 @@ progress_end_cb(GWEN_GUI *gwen_gui, guint32 id)
} }
static gint GNC_GWENHYWFAR_CB static gint GNC_GWENHYWFAR_CB
#ifndef AQBANKING6
getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
const gchar *title, const gchar *text, gchar *buffer,
gint min_len, gint max_len, guint32 guiid)
#else
getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token, getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
const gchar *title, const gchar *text, gchar *buffer, const gchar *title, const gchar *text, gchar *buffer,
gint min_len, gint max_len, GWEN_GUI_PASSWORD_METHOD methodId, gint min_len, gint max_len, GWEN_GUI_PASSWORD_METHOD methodId,
GWEN_DB_NODE *methodParams, guint32 guiid) GWEN_DB_NODE *methodParams, guint32 guiid)
#endif
{ {
GncGWENGui *gui = GETDATA_GUI(gwen_gui); GncGWENGui *gui = GETDATA_GUI(gwen_gui);
gchar *password = NULL; gchar *password = NULL;
gboolean is_tan = (flags & GWEN_GUI_INPUT_FLAGS_TAN) != 0; gboolean is_tan = (flags & GWEN_GUI_INPUT_FLAGS_TAN) != 0;
#ifdef AQBANKING6
int opticalMethodId; int opticalMethodId;
const char *mimeType = NULL; const char *mimeType = NULL;
const char *pChallenge = NULL; const char *pChallenge = NULL;
uint32_t lChallenge = 0; uint32_t lChallenge = 0;
#endif
g_return_val_if_fail(gui, -1); g_return_val_if_fail(gui, -1);
#ifdef AQBANKING6
// cf. https://www.aquamaniac.de/rdm/projects/aqbanking/wiki/ImplementTanMethods // cf. https://www.aquamaniac.de/rdm/projects/aqbanking/wiki/ImplementTanMethods
if(is_tan && methodId == GWEN_Gui_PasswordMethod_OpticalHHD) if(is_tan && methodId == GWEN_Gui_PasswordMethod_OpticalHHD)
{ {
@ -1507,7 +1470,6 @@ getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
break; break;
} }
} }
#endif
ENTER("gui=%p, flags=%d, token=%s", gui, flags, token ? token : "(null"); ENTER("gui=%p, flags=%d, token=%s", gui, flags, token ? token : "(null");
@ -1536,11 +1498,7 @@ getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
} }
} }
#ifndef AQBANKING6
get_input(gui, flags, title, text, &password, min_len, max_len);
#else
get_input(gui, flags, title, text, mimeType, pChallenge, lChallenge, &password, min_len, max_len); get_input(gui, flags, title, text, mimeType, pChallenge, lChallenge, &password, min_len, max_len);
#endif
if (password) if (password)
{ {