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

More work on HBCI2 code. Setup druid shows weird behaviour upon delete_initial_druid(). Still unfinished.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@9814 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2004-01-30 18:00:55 +00:00
parent 8a7a767a89
commit 296f308be8
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/import-export/hbci/druid-hbci-initial.c
View File

@ -38,6 +38,7 @@
#include "gnc-ui-util.h"
#include "gnc-ui.h"
#include "gnc-html.h"
#include "gnc-component-manager.h"
#include <openhbci2/api.h>
#include <openhbci2/outboxjob.h>
@ -152,10 +153,11 @@ static void
reset_initial_info (HBCIInitialInfo *info)
{
if (info == NULL) return;
if (info->api != NULL)
gnc_hbci_api_delete (info->api);
info->api = NULL;
if (info->outbox != NULL)
HBCI_Outbox_delete(info->outbox);
info->outbox = NULL;
@ -184,10 +186,18 @@ delete_initial_druid (HBCIInitialInfo *info)
reset_initial_info (info);
if (info->interactor)
GNCInteractor_delete(info->interactor);
printf("delete_initial_druid: FIXME: gnucash will crash here in a call to gnome_entry_destroy(), probably related to the configfileentry object.\n");
if (info->window != NULL)
gtk_widget_destroy (info->window);
printf("delete_initial_druid: FIXME: this is not reached \n");
g_free (info);
printf("delete_initial_druid: 4\n");
}
@ -612,17 +622,18 @@ on_finish (GnomeDruidPage *gnomedruidpage,
gpointer user_data)
{
HBCIInitialInfo *info = user_data;
gboolean successful = TRUE;
g_assert (info);
if (info->configfile) {
printf("on_finish: Got configfile %s, but the book has %s.\n", info->configfile, gnc_hbci_get_book_configfile (gnc_get_current_book ()));
//printf("on_finish: Got configfile %s, but the book has %s.\n", info->configfile, gnc_hbci_get_book_configfile (gnc_get_current_book ()));
if (!gnc_hbci_get_book_configfile (gnc_get_current_book ()) ||
(strcmp(info->configfile,
gnc_hbci_get_book_configfile (gnc_get_current_book ())) != 0)) {
/* Name of configfile has changed */
gnc_hbci_set_book_configfile (gnc_get_current_book (), info->configfile);
if (strcmp(info->configfile,
if ((gnc_hbci_get_book_configfile (gnc_get_current_book ()) == 0) ||
strcmp(info->configfile,
gnc_hbci_get_book_configfile (gnc_get_current_book ())) != 0)
printf("on_finish: OOOPS: I just setted the book_configfile to %s, but the book now still has %s.\n", info->configfile, gnc_hbci_get_book_configfile (gnc_get_current_book ()));
}
@ -630,29 +641,30 @@ on_finish (GnomeDruidPage *gnomedruidpage,
{
HBCI_Error *err;
printf("on_finish: trying to save openhbci data to file %s.\n", info->configfile);
//printf("on_finish: trying to save openhbci data to file %s.\n", gnc_hbci_get_book_configfile (gnc_get_current_book ()));
err = gnc_hbci_api_save (info->api);
//printf("on_finish: finished saving openhbci data to file.\n");
if (err != NULL) {
if (!HBCI_Error_isOk (err))
if (!HBCI_Error_isOk (err)) {
successful = FALSE;
printf("on_finish: Error at saving OpenHBCI data: %s.\n",
HBCI_Error_message (err));
}
HBCI_Error_delete (err);
delete_initial_druid(info);
return;
}
}
if (info->gnc_hash)
if (successful && info->gnc_hash)
accounts_save_kvp (info->gnc_hash);
if (info->hbci_accountlist)
if (successful && info->hbci_accountlist)
{
GList *kvplist =
gnc_HBCI_Account_kvp_glist_from_glist(info->hbci_accountlist);
gnc_hbci_set_book_account_list (gnc_get_current_book (), kvplist);
}
delete_initial_druid(info);
}

17
src/import-export/hbci/gnc-hbci-kvp.c
View File

@ -21,6 +21,7 @@
\********************************************************************/
#include "gnc-hbci-kvp.h"
#include <stdio.h>
#define HBCI_KEY "hbci"
#define HBCI_ACCOUNT_ID "account-id"
@ -139,8 +140,13 @@ void gnc_hbci_set_book_account_list (GNCBook *b, GList *account_list)
/* getters for kvp frame in book */
kvp_frame *gnc_hbci_get_book_kvp (GNCBook *b)
{
kvp_frame *toplevel = gnc_book_get_slots (b);
return kvp_frame_get_frame (toplevel, HBCI_KEY);
kvp_frame *toplevel = qof_book_get_slots (b);
kvp_frame *result = kvp_frame_get_frame (toplevel, HBCI_KEY);
if (!result) {
result = kvp_frame_new();
kvp_frame_add_frame_nc (toplevel, HBCI_KEY, result);
}
return result;
}
@ -149,5 +155,10 @@ kvp_frame *gnc_hbci_get_book_kvp (GNCBook *b)
kvp_frame *gnc_hbci_get_account_kvp (Account *a)
{
kvp_frame *toplevel = xaccAccountGetSlots (a);
return kvp_frame_get_frame (toplevel, HBCI_KEY);
kvp_frame *result = kvp_frame_get_frame (toplevel, HBCI_KEY);
if (!result) {
result = kvp_frame_new();
kvp_frame_add_frame_nc (toplevel, HBCI_KEY, result);
}
return result;
}