options.c: The GH interface has been removed in guile-2.0 so do not use it anymore in xbindkeys.

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f66a3a5..772b2f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2011-03-09  Hans-Peter Deifel <hpdeifel@gmx.de>
 
 	* options.c: Replace some deprecated guile functions.
+	The GH interface has been removed in guile-2.0 so do not use it
+	anymore in xbindkeys.
 
 2011-02-21  Philippe Brochard  <pbrochard@common-lisp.net>
 
diff --git a/options.c b/options.c
index b55989e..82e6d10 100644
--- a/options.c
+++ b/options.c
@@ -28,7 +28,6 @@
 
 #ifdef GUILE_FLAG
 #include <libguile.h>
-#include <guile/gh.h>
 #endif
 
 char *display_name = NULL;
@@ -1060,7 +1059,7 @@ SCM xbindkey_function_wrapper (SCM key, SCM fun)
       return SCM_BOOL_F;
     }
   else {
-    printf ("add_key ok!!!  fun=%d\n", gh_procedure_p (fun));
+    printf ("add_key ok!!!  fun=%d\n", (scm_procedure_p (fun) == SCM_BOOL_T));
   }
 
   //scm_permanent_object (tab_scm[0]);