From 9d61ff898a6fea9cd018928078f12337356c475c Mon Sep 17 00:00:00 2001
From: Phil Longstaff <plongstaff@newearth.org>
Date: Sat, 17 Oct 2009 17:47:56 +0000
Subject: [PATCH] Fix 598491: Remove use of guile's deprecated GH interface

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18384 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 macros/gnome-guile-checks.m4                | 3 +--
 src/app-utils/gnc-exp-parser.c              | 7 +++++--
 src/optional/python-bindings/gnucash_core.i | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4
index 289997edf2..da2aa93448 100644
--- a/macros/gnome-guile-checks.m4
+++ b/macros/gnome-guile-checks.m4
@@ -88,9 +88,8 @@ AC_DEFUN([GNOME_CHECK_GUILE],
 	AC_MSG_CHECKING(whether guile works)
 	AC_TRY_LINK([
 		#include <libguile.h>
-		#include <guile/gh.h>
 	],[
-		gh_eval_str("(newline)");
+		scm_c_eval_string("(newline)");
 		scm_boot_guile(0,NULL,NULL,NULL);
 	],[
 		ac_cv_guile_found=yes
diff --git a/src/app-utils/gnc-exp-parser.c b/src/app-utils/gnc-exp-parser.c
index da599f74e3..e1a673d88f 100644
--- a/src/app-utils/gnc-exp-parser.c
+++ b/src/app-utils/gnc-exp-parser.c
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <guile/gh.h>
+#include <libguile.h>
 #include <ctype.h>
 #include <locale.h>
 #include <string.h>
@@ -342,7 +342,10 @@ func_op(const char *fname, int argc, void **argv)
 
   realFnName = g_string_sized_new( strlen(fname) + 5 );
   g_string_printf( realFnName, "gnc:%s", fname );
-  scmFn = gh_eval_str_with_standard_handler( realFnName->str );
+//  scmFn = gh_eval_str_with_standard_handler( realFnName->str );
+  scmFn = scm_internal_catch(SCM_BOOL_T,
+                     (scm_catch_body_t)scm_c_eval_string, realFnName->str,
+					 scm_handle_by_message_noexit, NULL);
   g_string_free( realFnName, TRUE );
   if (!SCM_PROCEDUREP(scmFn)) {
     /* FIXME: handle errors correctly. */
diff --git a/src/optional/python-bindings/gnucash_core.i b/src/optional/python-bindings/gnucash_core.i
index 1dded93b3e..2f681617fb 100644
--- a/src/optional/python-bindings/gnucash_core.i
+++ b/src/optional/python-bindings/gnucash_core.i
@@ -45,7 +45,7 @@
 #include "gncVendor.h"
 #include "gncAddress.h"
 #include "gncBillTerm.h"
-#include <guile/gh.h>
+#include <libguile.h>
 %}
 
 %include <timespec.i>