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

Use g_spawn_async instead of fork/execl for AqBanking Qt3 wizard.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15632 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2007-02-19 22:21:02 +00:00
parent 3373f77979
commit b613c14022
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,8 +402,19 @@ on_accountlist_changed (GtkTreeSelection *selection,
static void
on_child_exit (GPid pid, gint status, gpointer data)
{
gint *data_status = data;
#ifdef G_OS_WIN32
*data_status = status;
#else
*data_status = WEXITSTATUS (status);
#endif
g_spawn_close_pid (pid);
gtk_main_quit ();
}
#if (AQBANKING_VERSION_MAJOR > 1) || \ #if (AQBANKING_VERSION_MAJOR > 1) || \
@ -549,23 +560,6 @@ on_aqhbci_button (GtkButton *button,
druid_disable_next_button(info); druid_disable_next_button(info);
/* AB_Banking_DeactivateProvider(banking, backend_name); */ /* AB_Banking_DeactivateProvider(banking, backend_name); */
if (wizard_exists) { if (wizard_exists) {
#ifdef G_OS_WIN32
/* FIXME: Use something different than fork() for the child
process here. See src/backend/file/io-gncxml-v2.c that has
the same problem. */
gnc_error_dialog
(info->window,
_("The Windows version of GnuCash does not (yet) have the "
"capability to start the external program \"%s Setup Wizard\". "
"Please start it yourself from the location \"%s\" "
"before you continue."),
backend_name, wizard_path);
res = 0;
#else
/* Normal non-Windows operating system */
int wait_status;
int wait_result = 0;
/* Call the qt wizard. See the note above about why this approach /* Call the qt wizard. See the note above about why this approach
is chosen. */ is chosen. */
@ -574,42 +568,37 @@ on_aqhbci_button (GtkButton *button,
if (info->gnc_hash != NULL) if (info->gnc_hash != NULL)
g_hash_table_destroy (info->gnc_hash); g_hash_table_destroy (info->gnc_hash);
info->gnc_hash = NULL; info->gnc_hash = NULL;
/* In gtk2, this would be g_spawn_async or similar. */
{ {
pid_t pid; GPid pid;
pid = fork(); GError *error = NULL;
switch (pid) { gchar *argv[2];
case -1: gboolean spawned;
g_critical("Fork call failed. Cannot start AqBanking setup wizard.");
argv[0] = g_strdup (wizard_path);
argv[1] = NULL;
spawned = g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &pid, &error);
g_free (argv[0]);
if (!spawned) {
g_critical("Could not start AqBanking setup wizard: %s",
error->message ? error->message : "(null)");
g_error_free (error);
res = -1; res = -1;
AB_Banking_Init (info->api); } else {
break; g_child_watch_add (pid, on_child_exit, &res);
case 0: /* child */
execl(wizard_path, wizard_path, NULL);
g_critical("Fork call failed. Cannot start AqBanking setup wizard.");
_exit(0);
default: /* parent */
res = 0;
/* wait until child is finished */
hbci_druid_is_active = TRUE; hbci_druid_is_active = TRUE;
while (wait_result == 0) { gtk_main ();
gtk_main_iteration();
wait_result = waitpid(pid, &wait_status, WNOHANG);
if ((wait_result == pid) && WIFEXITED(wait_status))
res = WEXITSTATUS(wait_status);
else
res = -8;
}
if (!hbci_druid_is_active) { if (!hbci_druid_is_active) {
/* Just in case the druid has been canceled in the meantime. */ /* Just in case the druid has been canceled in the meantime. */
g_free (backend_name); g_free (backend_name);
GWEN_Buffer_free(buf); GWEN_Buffer_free(buf);
return; return;
} }
}
AB_Banking_Init (info->api); AB_Banking_Init (info->api);
} }
}
#endif /* G_OS_WIN32 */
if (res == 0) { if (res == 0) {
#ifndef AQBANKING_WIZARD_ALLBACKENDS #ifndef AQBANKING_WIZARD_ALLBACKENDS