[Gnucash-changes] r14203 - gnucash/trunk - Simplify calling the aqhbci setup wizard for aqbanking>=1.9.1 because we don't need to select an aqbanking backend beforehand.

[Christian Stimming]

Author: cstim
Date: 2006-05-26 08:53:34 -0400 (Fri, 26 May 2006)
New Revision: 14203
Trac: http://svn.gnucash.org/trac/changeset/14203

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
Log:
Simplify calling the aqhbci setup wizard for aqbanking>=1.9.1 because we don't need to select an aqbanking backend beforehand.

Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-05-26 11:01:22 UTC (rev 14202)
+++ gnucash/trunk/ChangeLog	2006-05-26 12:53:34 UTC (rev 14203)
@@ -1,3 +1,9 @@
+2006-05-26   Christian Stimming <stimming at tuhh.de>
+
+	* src/import-export/hbci/druid-hbci-initial.c: Simplify calling
+	the aqhbci setup wizard for aqbanking>=1.9.1 because we don't need
+	to select an aqbanking backend beforehand.
+
 2006-05-25  Chris Shoemaker <chris.shoemaker at cox.net>
 
 	* configure.in: REactivate --enable-sql by reverting part of r14175 

Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c	2006-05-26 11:01:22 UTC (rev 14202)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c	2006-05-26 12:53:34 UTC (rev 14203)
@@ -45,6 +45,7 @@
 #include "gnc-component-manager.h"
 
 #include <aqbanking/banking.h>
+#include <aqbanking/version.h>
 #include <gwenhywfar/stringlist.h>
 #include <gwenhywfar/version.h>
 
@@ -443,6 +444,17 @@
   }
 }
 
+#if (AQBANKING_VERSION_MAJOR > 1) || \
+  ((AQBANKING_VERSION_MAJOR == 1) && \
+    (AQBANKING_VERSION_MINOR == 9) && \
+     (AQBANKING_VERSION_PATCHLEVEL > 0))
+/* The wizard choice has changed with aqbanking >= 1.9.1; we don't
+   need to specify a "backend" for the wizard anymore but instead
+   there is only one wizard for all backends now. */
+# define AQBANKING_WIZARD_ALLBACKENDS
+#else
+# undef AQBANKING_WIZARD_ALLBACKENDS
+#endif
 
 static void
 on_aqhbci_button (GtkButton *button,
@@ -451,8 +463,6 @@
   HBCIInitialInfo *info = user_data;
   GWEN_BUFFER *buf;
   int res;
-  GWEN_PLUGIN_DESCRIPTION_LIST2 *pluginlist;
-  const char *backend_name_nc;
   char *backend_name;
 
   /* This is the point where we look for and start an external
@@ -469,6 +479,12 @@
   AB_BANKING *banking = info->api;
   g_assert(info->druid);
 
+  /* See note above about wizard choice. */
+#ifndef AQBANKING_WIZARD_ALLBACKENDS
+  {
+  GWEN_PLUGIN_DESCRIPTION_LIST2 *pluginlist;
+  const char *backend_name_nc;
+
   /* Get list of all backends, active or inactive */
   pluginlist = AB_Banking_GetProviderDescrs (banking);
 
@@ -545,7 +561,12 @@
      gwenhywfar>=1.98.x */
   GWEN_PluginDescription_List2_free (pluginlist);
 #endif
+  }
 
+#else /* AQBANKING_WIZARD_ALLBACKENDS */
+  backend_name = g_strdup("");
+#endif /* AQBANKING_WIZARD_ALLBACKENDS */
+
   /* ***** */
 
   /* Now find out the wizard name for that backend */
@@ -603,7 +624,9 @@
     }
 
     if (res == 0) {
+#ifndef AQBANKING_WIZARD_ALLBACKENDS
       res = AB_Banking_ActivateProvider(banking, backend_name);
+#endif
       if ((res == 0) || (res == AB_ERROR_FOUND))
 	druid_enable_next_button(info);
       else {