[Guile-GTK] Conditionalize `gtk_link_button_set_uri_hook ()'.
Ludovic Courtès <[email protected]>
| Newsgroups | gmane.lisp.guile.gtk |
|---|---|
| Message-ID | <[email protected]> |
From: Ludovic Courtès <[email protected]> * configure.ac: Check for `gtk_link_button_set_uri_hook ()'. * gtk-2.0.defs (gtk_link_button_set_uri_hook_interp): Conditionalize. * gtk-support.c (gtk_link_button_set_uri_hook_interp): Enclose in `#ifdef HAVE_GTK_LINK_BUTTON_SET_URI_HOOK'. --- configure.ac | 3 ++- gtk-2.0.defs | 3 ++- gtk-support.c | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bb6ffa9..8771ccc 100644 --- a/configure.ac +++ b/configure.ac @@ -145,9 +145,10 @@ CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" # Reasons for testing: # g_object_ref_sink - not in glib 2.6 # gtk_link_button_new - new in gtk 2.10 +# gtk_link_button_set_uri_hook - new in gtk 2.10 # mallinfo - not available on ancient systems # -AC_CHECK_FUNCS(g_object_ref_sink gtk_link_button_new mallinfo scm_c_issue_deprecation_warning) +AC_CHECK_FUNCS(g_object_ref_sink gtk_link_button_new gtk_link_button_set_uri_hook mallinfo scm_c_issue_deprecation_warning) AC_CHECK_HEADERS(malloc.h libguile/deprecation.h) diff --git a/gtk-2.0.defs b/gtk-2.0.defs index 3531cfd..332c810 100644 --- a/gtk-2.0.defs +++ b/gtk-2.0.defs @@ -5305,7 +5305,8 @@ (define-func gtk_link_button_set_uri_hook_interp none - ((SCM func))) + ((SCM func)) + (conditionalize "HAVE_GTK_LINK_BUTTON_SET_URI_HOOK")) ;; Options diff --git a/gtk-support.c b/gtk-support.c index 90c4e3e..c95e15f 100644 --- a/gtk-support.c +++ b/gtk-support.c @@ -298,6 +298,8 @@ gtk_about_dialog_set_url_hook_interp (SCM func) (GDestroyNotify) scm_gc_unprotect_object); } +#ifdef HAVE_GTK_LINK_BUTTON_SET_URI_HOOK + /* GtkLinkButtonUriFunc and GtkAboutDialogActivateLinkFunc are the same except for a pointer type, so can use sgtk_about_dialog_activate_link_marshal here. */ @@ -313,6 +315,8 @@ gtk_link_button_set_uri_hook_interp (SCM func) (GDestroyNotify) scm_gc_unprotect_object); } +#endif /* HAVE_GTK_LINK_BUTTON_SET_URI_HOOK */ + /* These SCM_PROCs are here to have them initialized in -- 1.5.3.4