gnucash master: Restore AQBanking to operation.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/82832634 (commit)
	from  https://github.com/Gnucash/gnucash/commit/09a8bee5 (commit)



commit 8283263459bcdd1a317300fad2cdc333026f528d
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu May 14 17:09:30 2020 -0700

    Restore AQBanking to operation.
    
    And remove some dead code that had been #if-0ed since it was written.

diff --git a/gnucash/import-export/aqb/assistant-ab-initial.c b/gnucash/import-export/aqb/assistant-ab-initial.c
index ec0acb8c4..5f8b7b8ce 100644
--- a/gnucash/import-export/aqb/assistant-ab-initial.c
+++ b/gnucash/import-export/aqb/assistant-ab-initial.c
@@ -288,7 +288,7 @@ aai_wizard_button_clicked_cb(GtkButton *button, gpointer user_data)
             if (rv <= 0)
             {
                 /* Dialog was aborted/rejected */
-                PERR("Setup Dialog of aqbanking aborted/rejected !");
+                PERR("Setup Dialog of aqbanking aborted/rejected, code %d", rv);
             }
             GWEN_Dialog_free(dlg);
         }
diff --git a/gnucash/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
index 48f0aa166..54fa72953 100644
--- a/gnucash/import-export/aqb/gnc-gwen-gui.c
+++ b/gnucash/import-export/aqb/gnc-gwen-gui.c
@@ -58,65 +58,6 @@
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = G_LOG_DOMAIN;
 
-/* The following block can be enabled, but the gwen-gtk3 widgets might
- * still need some work. */
-#if 0 /*#ifdef USING_GWENHYWFAR_GTK3_GUI*/
-
-/* A GWEN_GUI implementation using gtk3 widgets  */
-static GWEN_GUI *gwen_gui = NULL;
-
-void gnc_GWEN_Gui_log_init(void)
-{
-    if (!gwen_gui)
-    {
-        gwen_gui = Gtk3_Gui_new();
-        GWEN_Gui_SetGui(gwen_gui);
-    }
-}
-GncGWENGui *gnc_GWEN_Gui_get(GtkWidget *parent)
-{
-    if (!gwen_gui)
-        gnc_GWEN_Gui_log_init();
-    return (GncGWENGui*) gwen_gui;
-}
-void gnc_GWEN_Gui_release(GncGWENGui *gui)
-{
-}
-void gnc_GWEN_Gui_shutdown(void)
-{
-    if (gwen_gui)
-    {
-        GWEN_Gui_free(gwen_gui);
-        gwen_gui = NULL;
-        GWEN_Gui_SetGui(NULL);
-    }
-}
-void
-gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
-{
-    gnc_prefs_set_bool(
-        GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
-        close_when_finished);
-}
-gboolean
-gnc_GWEN_Gui_get_close_flag()
-{
-    return gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH);
-}
-
-gboolean
-gnc_GWEN_Gui_show_dialog()
-{
-    return TRUE;
-}
-
-void
-gnc_GWEN_Gui_hide_dialog()
-{
-}
-
-#else
-
 /* A unique full-blown GUI, featuring  */
 static GncGWENGui *full_gui = NULL;
 
@@ -301,13 +242,7 @@ gnc_GWEN_Gui_log_init(void)
 {
     if (!log_gwen_gui)
     {
-        log_gwen_gui =
-#ifdef USING_GWENHYWFAR_GTK3_GUI
-            Gtk3_Gui_new()
-#else
-            GWEN_Gui_new()
-#endif
-            ;
+        log_gwen_gui = Gtk3_Gui_new();
 
         /* Always use our own logging */
         GWEN_Gui_SetLogHookFn(log_gwen_gui, loghook_cb);
@@ -471,13 +406,7 @@ register_callbacks(GncGWENGui *gui)
 
     ENTER("gui=%p", gui);
 
-    gwen_gui =
-#ifdef USING_GWENHYWFAR_GTK3_GUI
-        Gtk3_Gui_new()
-#else
-        GWEN_Gui_new()
-#endif
-        ;
+    gwen_gui = Gtk3_Gui_new();
     gui->gwen_gui = gwen_gui;
 
     GWEN_Gui_SetMessageBoxFn(gwen_gui, messagebox_cb);
@@ -1745,4 +1674,3 @@ ggg_close_toggled_cb(GtkToggleButton *button, gpointer user_data)
 
     LEAVE(" ");
 }
-#endif



Summary of changes:
 gnucash/import-export/aqb/assistant-ab-initial.c |  2 +-
 gnucash/import-export/aqb/gnc-gwen-gui.c         | 76 +-----------------------
 2 files changed, 3 insertions(+), 75 deletions(-)