From 8dd7d2d0358f52330d8fa6b907dd93124ccc8354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Thu, 20 Mar 2008 23:14:55 +0000 Subject: [PATCH] Remove some unnessary aqbanking version checks as we depend on >= 1.6.1. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17038 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/hbci/dialog-hbcitrans.c | 31 +----------------- src/import-export/hbci/gnc-plugin-hbci.c | 38 ++--------------------- 2 files changed, 4 insertions(+), 65 deletions(-) diff --git a/src/import-export/hbci/dialog-hbcitrans.c b/src/import-export/hbci/dialog-hbcitrans.c index cf97ce9017..48fc75863c 100644 --- a/src/import-export/hbci/dialog-hbcitrans.c +++ b/src/import-export/hbci/dialog-hbcitrans.c @@ -33,14 +33,7 @@ #include #include #include -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) -# include -#endif +#include #include #include "dialog-utils.h" @@ -487,20 +480,12 @@ int gnc_hbci_dialog_run_until_ok(HBCITransDialog *td, g_warning("gnc_hbci_trans_dialog_enqueue: Oops, job not available. Aborting.\n"); return GTK_RESPONSE_CANCEL; } -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 0) || \ - ((AQBANKING_VERSION_MINOR == 0) && \ - (AQBANKING_VERSION_PATCHLEVEL > 6))))) { const AB_TRANSACTION_LIMITS *joblimits = AB_JobSingleTransfer_GetFieldLimits(job); max_purpose_lines = (joblimits ? AB_TransactionLimits_GetMaxLinesPurpose (joblimits) : 2); } -#else - max_purpose_lines = AB_JobSingleTransfer_GetMaxPurposeLines(job); -#endif /* these are the number of fields, 27 characters each. */ AB_Job_free(job); } @@ -767,15 +752,8 @@ gnc_hbci_trans_dialog_enqueue(const AB_TRANSACTION *hbci_trans, AB_BANKING *api, job = AB_JobSingleDebitNote_new(h_acc); break; case SINGLE_INTERNAL_TRANSFER: -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) job = AB_JobInternalTransfer_new(h_acc); break; -#endif default: case SINGLE_TRANSFER: job = AB_JobSingleTransfer_new(h_acc); @@ -790,15 +768,8 @@ gnc_hbci_trans_dialog_enqueue(const AB_TRANSACTION *hbci_trans, AB_BANKING *api, AB_JobSingleDebitNote_SetTransaction(job, hbci_trans); break; case SINGLE_INTERNAL_TRANSFER: -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) AB_JobInternalTransfer_SetTransaction(job, hbci_trans); break; -#endif default: case SINGLE_TRANSFER: AB_JobSingleTransfer_SetTransaction(job, hbci_trans); diff --git a/src/import-export/hbci/gnc-plugin-hbci.c b/src/import-export/hbci/gnc-plugin-hbci.c index caf3a8f852..e96ae09dec 100644 --- a/src/import-export/hbci/gnc-plugin-hbci.c +++ b/src/import-export/hbci/gnc-plugin-hbci.c @@ -71,14 +71,7 @@ static void gnc_plugin_hbci_cmd_setup (GtkAction *action, GncMainWindowActionDat static void gnc_plugin_hbci_cmd_get_balance (GtkAction *action, GncMainWindowActionData *data); static void gnc_plugin_hbci_cmd_get_transactions (GtkAction *action, GncMainWindowActionData *data); static void gnc_plugin_hbci_cmd_issue_transaction (GtkAction *action, GncMainWindowActionData *data); -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) static void gnc_plugin_hbci_cmd_issue_inttransaction (GtkAction *action, GncMainWindowActionData *data); -#endif static void gnc_plugin_hbci_cmd_issue_direct_debit (GtkAction *action, GncMainWindowActionData *data); static void gnc_plugin_hbci_cmd_mt940_import (GtkAction *action, GncMainWindowActionData *data); static void gnc_plugin_hbci_cmd_mt942_import (GtkAction *action, GncMainWindowActionData *data); @@ -108,16 +101,9 @@ static GtkActionEntry gnc_plugin_actions [] = { { "HbciIssueTransAction", NULL, N_("_Issue Transaction..."), NULL, N_("Issue a new transaction online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_transaction) }, -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) { "HbciIssueIntTransAction", NULL, N_("I_nternal Transaction..."), NULL, N_("Issue a new bank-internal transaction online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_inttransaction) }, -#endif { "HbciIssueDirectDebitAction", NULL, N_("_Direct Debit..."), NULL, N_("Issue a new direct debit note online through Online Banking"), G_CALLBACK (gnc_plugin_hbci_cmd_issue_direct_debit) }, @@ -147,23 +133,12 @@ static GtkActionEntry gnc_plugin_actions [] = { }; static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions); -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) -# define INTTRANSACTION "HbciIssueIntTransAction", -#else -# define INTTRANSACTION -#endif - static const gchar *account_tree_actions[] = { "HbciSetupAction", "HbciGetBalanceAction", "HbciGetTransAction", "HbciIssueTransAction", - INTTRANSACTION + "HbciIssueIntTransAction", "HbciIssueDirectDebitAction", NULL }; @@ -173,7 +148,7 @@ static const gchar *register_actions[] = { "HbciGetBalanceAction", "HbciGetTransAction", "HbciIssueTransAction", - INTTRANSACTION + "HbciIssueIntTransAction", "HbciIssueDirectDebitAction", NULL }; @@ -182,7 +157,7 @@ static const gchar *need_account_actions[] = { "HbciGetBalanceAction", "HbciGetTransAction", "HbciIssueTransAction", - INTTRANSACTION + "HbciIssueIntTransAction", "HbciIssueDirectDebitAction", NULL }; @@ -540,12 +515,6 @@ gnc_plugin_hbci_cmd_issue_transaction (GtkAction *action, LEAVE(" "); } -#if ((AQBANKING_VERSION_MAJOR > 1) || \ - ((AQBANKING_VERSION_MAJOR == 1) && \ - ((AQBANKING_VERSION_MINOR > 6) || \ - ((AQBANKING_VERSION_MINOR == 6) && \ - ((AQBANKING_VERSION_PATCHLEVEL > 0) || \ - (AQBANKING_VERSION_BUILD > 2)))))) static void gnc_plugin_hbci_cmd_issue_inttransaction (GtkAction *action, GncMainWindowActionData *data) @@ -562,7 +531,6 @@ gnc_plugin_hbci_cmd_issue_inttransaction (GtkAction *action, gnc_hbci_maketrans(GTK_WIDGET(data->window), account, SINGLE_INTERNAL_TRANSFER); LEAVE(" "); } -#endif static void gnc_plugin_hbci_cmd_issue_direct_debit (GtkAction *action,