r18384 - gnucash/trunk - Fix 598491: Remove use of guile's deprecated GH interface

[Phil Longstaff]

Author: plongstaff
Date: 2009-10-17 13:47:56 -0400 (Sat, 17 Oct 2009)
New Revision: 18384
Trac: http://svn.gnucash.org/trac/changeset/18384

Modified:
   gnucash/trunk/macros/gnome-guile-checks.m4
   gnucash/trunk/src/app-utils/gnc-exp-parser.c
   gnucash/trunk/src/optional/python-bindings/gnucash_core.i
Log:
Fix 598491: Remove use of guile's deprecated GH interface


Modified: gnucash/trunk/macros/gnome-guile-checks.m4
===================================================================
--- gnucash/trunk/macros/gnome-guile-checks.m4	2009-10-16 20:15:11 UTC (rev 18383)
+++ gnucash/trunk/macros/gnome-guile-checks.m4	2009-10-17 17:47:56 UTC (rev 18384)
@@ -88,9 +88,8 @@
 	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

Modified: gnucash/trunk/src/app-utils/gnc-exp-parser.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-exp-parser.c	2009-10-16 20:15:11 UTC (rev 18383)
+++ gnucash/trunk/src/app-utils/gnc-exp-parser.c	2009-10-17 17:47:56 UTC (rev 18384)
@@ -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 @@
 
   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. */

Modified: gnucash/trunk/src/optional/python-bindings/gnucash_core.i
===================================================================
--- gnucash/trunk/src/optional/python-bindings/gnucash_core.i	2009-10-16 20:15:11 UTC (rev 18383)
+++ gnucash/trunk/src/optional/python-bindings/gnucash_core.i	2009-10-17 17:47:56 UTC (rev 18384)
@@ -45,7 +45,7 @@
 #include "gncVendor.h"
 #include "gncAddress.h"
 #include "gncBillTerm.h"
-#include <guile/gh.h>
+#include <libguile.h>
 %}
 
 %include <timespec.i>