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

2003-04-16 Christian Stimming <stimming@tuhh.de>

Browse Source 
* src/import-export/hbci/druid-hbci-initial.c,
	src/import-export/hbci/hbci-interaction.c: Adapt to latest changes
	in OpenHBCI CVS.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8233 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2003-04-15 22:38:52 +00:00
parent 96280e4e4a
commit 76d96bb991
3 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-04-16 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/druid-hbci-initial.c,
src/import-export/hbci/hbci-interaction.c: Adapt to latest changes
in OpenHBCI CVS.
2003-04-14 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/hbci-interaction.c: Fix some user

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

@ -44,6 +44,11 @@
#include <openhbci/outboxjobkeys.h>
#include <openhbci/mediumrdhbase.h>
#include <openhbci.h>
#ifndef OPENHBCI_VERSION_BUILD
# define OPENHBCI_VERSION_BUILD 0
#endif
typedef enum _infostate {
INI_ADD_BANK,
INI_ADD_USER,
@ -886,6 +891,7 @@ on_userid_next (GnomeDruidPage *gnomedruidpage,
HBCI_User *newuser;
HBCI_Error *err;
char *mediumname;
const char *mediumtype;
int secmode;
//printf("on_userid_next: Didn't find user with userid %s.\n", userid);
@ -909,18 +915,30 @@ on_userid_next (GnomeDruidPage *gnomedruidpage,
return TRUE;
}
secmode = HBCI_SECURITY_RDH;
mediumtype = "RDHFile";
}
else {
/* Create DDV Medium */
mediumname = g_strdup("");
secmode = HBCI_SECURITY_DDV;
mediumtype = "DDVCard";
}
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
medium = HBCI_API_createNewMedium (api,
mediumtype,
FALSE,
HBCI_Bank_countryCode (bank),
HBCI_Bank_bankCode (bank),
userid,
mediumname, &err);
#else /* openhbci > 0.9.9.5 */
medium = HBCI_API_createNewMedium (api,
HBCI_Bank_countryCode (bank),
HBCI_Bank_bankCode (bank),
userid,
mediumname, secmode, &err);
#endif /* openhbci > 0.9.9.5 */
g_free(mediumname);
if (medium == NULL) {
@ -944,7 +962,11 @@ on_userid_next (GnomeDruidPage *gnomedruidpage,
/* Test mounting only for DDV cards. RDH files should work... */
if (secmode == HBCI_SECURITY_DDV) {
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
err = HBCI_Medium_mountMedium (medium, NULL);
#else /* openhbci > 0.9.9.5 */
err = HBCI_Medium_mountMedium (medium, newuser, NULL);
#endif /* openhbci > 0.9.9.5 */
if (err != NULL) {
printf("on_userid_next: Mounting medium failed: %s.\n",
HBCI_Error_message (err));

37
src/import-export/hbci/hbci-interaction.c
View File

@ -38,6 +38,11 @@
#include "dialog-pass.h"
#include <openhbci.h>
#ifndef OPENHBCI_VERSION_BUILD
# define OPENHBCI_VERSION_BUILD 0
#endif
#define PREF_TAB_ONLINE_BANKING N_("Online Banking & Importing")
@ -298,8 +303,12 @@ static int msgInsertMediumOrAbort(const HBCI_User *user,
b = HBCI_User_bank (user);
switch (mtype)
{
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeFile:
#else /* openhbci > 0.9.9.5 */
case MediumRDHFile:
case MediumRDHFileOld:
#endif /* openhbci > 0.9.9.5 */
if (b != NULL)
/* xgettext:c-format */
msgstr = g_strdup_printf ( _("Please make sure the key file for \n"
@ -311,8 +320,12 @@ static int msgInsertMediumOrAbort(const HBCI_User *user,
"user '%s' at unknown bank can be accessed."),
username);
break;
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeCard:
#else /* openhbci > 0.9.9.5 */
case MediumDDVCard:
case MediumRDHCard:
#endif /* openhbci > 0.9.9.5 */
default:
if (b != NULL)
/* xgettext:c-format */
@ -329,13 +342,21 @@ static int msgInsertMediumOrAbort(const HBCI_User *user,
else
switch (mtype)
{
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeFile:
#else /* openhbci > 0.9.9.5 */
case MediumRDHFile:
case MediumRDHFileOld:
#endif /* openhbci > 0.9.9.5 */
msgstr = g_strdup ( _("Please make sure the key file for \n"
"unknown user at unknown bank can be accessed."));
break;
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeCard:
#else /* openhbci > 0.9.9.5 */
case MediumDDVCard:
case MediumRDHCard:
#endif /* openhbci > 0.9.9.5 */
default:
msgstr = g_strdup ( _("Please insert chip card for \n"
"unknown user at unknown bank."));
@ -368,8 +389,12 @@ static int msgInsertCorrectMediumOrAbort(const HBCI_User *user,
b = HBCI_User_bank (user);
switch (mtype)
{
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeFile:
#else /* openhbci > 0.9.9.5 */
case MediumRDHFile:
case MediumRDHFileOld:
#endif /* openhbci > 0.9.9.5 */
if (b != NULL)
/* xgettext:c-format */
msgstr = g_strdup_printf ( _("The key file does not seem to be the correct \n"
@ -383,8 +408,12 @@ static int msgInsertCorrectMediumOrAbort(const HBCI_User *user,
"sure the correct key file can be accessed."),
username);
break;
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeCard:
#else /* openhbci > 0.9.9.5 */
case MediumDDVCard:
case MediumRDHCard:
#endif /* openhbci > 0.9.9.5 */
default:
if (b != NULL)
/* xgettext:c-format */
@ -401,14 +430,22 @@ static int msgInsertCorrectMediumOrAbort(const HBCI_User *user,
else
switch (mtype)
{
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeFile:
#else /* openhbci > 0.9.9.5 */
case MediumRDHFile:
case MediumRDHFileOld:
#endif /* openhbci > 0.9.9.5 */
msgstr = g_strdup ( _("The key file does not seem to be the correct \n"
"file for unknown user at unknown bank. Please make \n"
"sure the correct key file can be accessed."));
break;
#if (OPENHBCI_VERSION_MAJOR>0) || (OPENHBCI_VERSION_MINOR>9) || (OPENHBCI_VERSION_PATCHLEVEL>9) || (OPENHBCI_VERSION_BUILD>5)
case MediumTypeCard:
#else /* openhbci > 0.9.9.5 */
case MediumDDVCard:
case MediumRDHCard:
#endif /* openhbci > 0.9.9.5 */
default:
msgstr = g_strdup ( _("Please insert the correct chip card for \n"
"unknown user at unknown bank."));