r15427 - gnucash/trunk/src/import-export/hbci - Further preparations for potential aqbanking3 porting

[Christian Stimming]

Author: cstim
Date: 2007-01-25 07:22:38 -0500 (Thu, 25 Jan 2007)
New Revision: 15427
Trac: http://svn.gnucash.org/trac/changeset/15427

Modified:
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h
   gnucash/trunk/src/import-export/hbci/hbci-interaction.c
Log:
Further preparations for potential aqbanking3 porting

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h	2007-01-24 16:54:25 UTC (rev 15426)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.h	2007-01-25 12:22:38 UTC (rev 15427)
@@ -39,6 +39,8 @@
 # define AB_Banking_LogLevelVerbous GWEN_LoggerLevel_Verbous
 # define AB_Banking_LogLevelNotice GWEN_LoggerLevel_Notice
 # define AB_BANKING_LOGLEVEL GWEN_LOGGER_LEVEL
+# define AB_Banking_new(arg1, arg2) AB_Banking_new(arg1, arg2, 0)
+# define AB_ERROR_FOUND GWEN_ERROR_FOUND
 #endif
 
 #include "gnc-ui.h"

Modified: gnucash/trunk/src/import-export/hbci/hbci-interaction.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/hbci-interaction.c	2007-01-24 16:54:25 UTC (rev 15426)
+++ gnucash/trunk/src/import-export/hbci/hbci-interaction.c	2007-01-25 12:22:38 UTC (rev 15427)
@@ -44,6 +44,31 @@
 #include "dialog-pass.h"
 #include "gnc-hbci-utils.h"
 
+#include <aqbanking/version.h>
+#if AQBANKING_VERSION_MAJOR > 2
+# include <gwenhywfar/gui.h>
+# define AB_Banking_SetMessageBoxFn GWEN_Gui_SetMessageBoxFn
+# define AB_Banking_SetInputBoxFn GWEN_Gui_SetInputBoxFn
+# define AB_Banking_SetShowBoxFn GWEN_Gui_SetShowBoxFn
+# define AB_Banking_SetHideBoxFn GWEN_Gui_SetHideBoxFn
+# define AB_Banking_SetProgressStartFn GWEN_Gui_SetProgressStartFn
+# define AB_Banking_SetProgressAdvanceFn GWEN_Gui_SetProgressAdvanceFn
+# define AB_Banking_SetProgressLogFn GWEN_Gui_SetProgressLogFn
+# define AB_Banking_SetProgressEndFn GWEN_Gui_SetProgressEndFn
+# define AB_Banking_SetGetTanFn GWEN_Gui_SetGetTanFn
+# define AB_BANKING_MSG_FLAGS_TYPE_ERROR GWEN_GUI_MSG_FLAGS_TYPE_ERROR
+# define AB_BANKING_INPUT_FLAGS_CONFIRM GWEN_GUI_INPUT_FLAGS_CONFIRM
+# define AB_BANKING_INPUT_FLAGS_SHOW GWEN_GUI_INPUT_FLAGS_SHOW
+# define AB_BANKING_PROGRESS_NONE GWEN_GUI_PROGRESS_NONE
+# define AB_Banking_GetUserData(arg) GWEN_INHERIT_GETDATA(GWEN_GUI, GNCInteractor, arg)
+# define AB_Banking_SetUserData(arg1, arg2)
+/* Note about other changes: Replace callback object AB_BANKING by
+   GWEN_GUI, to be created by GWEN_GUI_new; replace GetTan
+   callback by watching for INPUT_FLAGS_TAN in InputBox(). */
+#endif
+
+GWEN_INHERIT(AB_BANKING, GNCInteractor)
+
 #define GCONF_SECTION_CONNECTION GCONF_SECTION "/connection_dialog"
 
 gchar *gnc__extractText(const char *text);
@@ -799,7 +824,6 @@
   while (g_main_context_iteration(context, FALSE));
 }
 
-GWEN_INHERIT(AB_BANKING, GNCInteractor)
 
 /********************************************************
  * Constructor