--- gdk-glue.c.orig 2008-07-30 09:55:56.000000000 +0100 +++ gdk-glue.c 2008-07-30 09:57:54.000000000 +0100 @@ -6883,6 +6883,7 @@ return sgtk_wrap_gtkobj ((GObject*)cr_ret); } +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) static char s_pango_layout_get_font_description[] = "pango-layout-get-font-description"; SCM @@ -6896,6 +6897,7 @@ return sgtk_boxed2scm (cr_ret, &sgtk_pango_font_description_info, 1); } +#endif static char s_pango_layout_get_text[] = "pango-layout-get-text"; @@ -7095,7 +7097,9 @@ scm_c_define_gsubr (s_pango_layout_get_size, 1, 0, 0, sgtk_pango_layout_get_size); scm_c_define_gsubr (s_pango_layout_set_text, 2, 1, 0, sgtk_pango_layout_set_text); scm_c_define_gsubr (s_pango_layout_get_text, 1, 0, 0, sgtk_pango_layout_get_text); +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) scm_c_define_gsubr (s_pango_layout_get_font_description, 1, 0, 0, sgtk_pango_layout_get_font_description); +#endif scm_c_define_gsubr (s_pango_layout_get_context, 1, 0, 0, sgtk_pango_layout_get_context); scm_c_define_gsubr (s_pango_layout_new, 1, 0, 0, sgtk_pango_layout_new); scm_c_define_gsubr (s_pango_layout_p, 1, 0, 0, sgtk_pango_layout_p); --- gtk-glue.c.orig 2008-07-29 21:26:55.000000000 +0100 +++ gtk-glue.c 2008-07-30 09:44:27.000000000 +0100 @@ -976,9 +976,11 @@ { "GtkTextView", G_TYPE_OBJECT, NULL, gtk_text_view_get_type } }; +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) sgtk_object_info sgtk_gtk_about_dialog_info = { { "GtkAboutDialog", G_TYPE_OBJECT, NULL, gtk_about_dialog_get_type } }; +#endif static sgtk_type_info *type_infos[] = { (sgtk_type_info*)&sgtk_gtk_window_type_info, @@ -1129,7 +1131,9 @@ (sgtk_type_info*)&sgtk_gtk_text_buffer_info, (sgtk_type_info*)&sgtk_gtk_text_view_info, (sgtk_type_info*)&sgtk_gtk_wrap_mode_info, +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) (sgtk_type_info*)&sgtk_gtk_about_dialog_info, +#endif NULL }; @@ -16306,6 +16310,7 @@ return SCM_UNSPECIFIED; } +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) static char s_gtk_about_dialog_p[] = "gtk-about-dialog?"; SCM @@ -16318,7 +16323,9 @@ cr_ret = sgtk_is_a_gtkobj (gtk_about_dialog_get_type(), c_obj); return ((cr_ret)? SCM_BOOL_T : SCM_BOOL_F); } +#endif +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) static char s_gtk_about_dialog_new[] = "gtk-about-dialog-new"; SCM @@ -16329,6 +16336,9 @@ return sgtk_wrap_gtkobj ((GObject*)cr_ret); } +#endif + +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) static char s_gtk_about_dialog_set_email_hook_interp[] = "gtk-about-dialog-set-email-hook"; @@ -16342,7 +16352,9 @@ return SCM_UNSPECIFIED; } +#endif +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) static char s_gtk_about_dialog_set_url_hook_interp[] = "gtk-about-dialog-set-url-hook"; SCM @@ -16355,6 +16367,7 @@ return SCM_UNSPECIFIED; } +#endif void sgtk_init_gtk_gtk_glue_types () @@ -16425,10 +16438,12 @@ sgtk_init_gtk_gtk_glue_types (); sgtk_init_gtk_gdk_glue_types (); sgtk_init_gtk_support (); +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) scm_c_define_gsubr (s_gtk_about_dialog_set_url_hook_interp, 1, 0, 0, sgtk_gtk_about_dialog_set_url_hook_interp); scm_c_define_gsubr (s_gtk_about_dialog_set_email_hook_interp, 1, 0, 0, sgtk_gtk_about_dialog_set_email_hook_interp); scm_c_define_gsubr (s_gtk_about_dialog_new, 0, 0, 0, sgtk_gtk_about_dialog_new); scm_c_define_gsubr (s_gtk_about_dialog_p, 1, 0, 0, sgtk_gtk_about_dialog_p); +#endif scm_c_define_gsubr (s_gtk_text_view_set_wrap_mode, 2, 0, 0, sgtk_gtk_text_view_set_wrap_mode); scm_c_define_gsubr (s_gtk_text_view_set_editable, 2, 0, 0, sgtk_gtk_text_view_set_editable); scm_c_define_gsubr (s_gtk_text_view_scroll_to_iter, 6, 0, 0, sgtk_gtk_text_view_scroll_to_iter); --- gtk-support.c.orig 2008-07-29 21:25:07.000000000 +0100 +++ gtk-support.c 2008-07-29 21:26:27.000000000 +0100 @@ -274,6 +274,7 @@ return the previously set function if it was a scheme level procedure, but that seems like more trouble than it's worth. */ +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) void gtk_about_dialog_set_email_hook_interp (SCM func) { @@ -285,7 +286,9 @@ (gpointer) SCM_UNPACK (scm_gc_protect_object (func)), (GDestroyNotify) scm_gc_unprotect_object); } +#endif +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) void gtk_about_dialog_set_url_hook_interp (SCM func) { @@ -297,6 +300,7 @@ (gpointer) SCM_UNPACK (scm_gc_protect_object (func)), (GDestroyNotify) scm_gc_unprotect_object); } +#endif /* This is new in Gtk 2.10, see GtkLinkButton in gtk-2.0.defs for comments on that. */ --- guile-gtk.c.orig 2008-07-29 21:12:10.000000000 +0100 +++ guile-gtk.c 2008-07-29 21:24:06.000000000 +0100 @@ -2469,6 +2469,8 @@ &stack_item); } +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) + /* "data" is the SCM procedure to call. This uses inner_callback_marshal() because it can do most of the work needed. */ @@ -2499,6 +2501,7 @@ scm_handle_by_message_noexit, "gtk", &stack_item); } +#endif struct closure_info { SCM proc; --- guile-gtk.h.orig 2008-07-29 21:12:50.000000000 +0100 +++ guile-gtk.h 2008-07-29 21:26:03.000000000 +0100 @@ -210,11 +210,14 @@ void sgtk_callback_destroy (gpointer data); SCM sgtk_callback_trampoline (SCM new_trampoline); +#if (((GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION > 5)) || GTK_MAJOR_VERSION > 2) void sgtk_about_dialog_activate_link_marshal (GtkAboutDialog *about, const gchar *link, gpointer data); void gtk_about_dialog_set_email_hook_interp (SCM func); void gtk_about_dialog_set_url_hook_interp (SCM func); +#endif + void gtk_link_button_set_uri_hook_interp (SCM func);