From 2defaa55ac21624f306ed11a19b7a6db4233c68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 15 May 2010 10:22:07 +0100 Subject: [PATCH] use gtk_widget_get_realized() instead of GTK_WIDGET_REALIZED() This is only available since Gtk+ 2.20.0. Fixes FTBFS with newer Gtk+ versions. Signed-off-by: Jonny Lamb --- src/hildon-help-private.h | 8 +++++++- src/osso-helplib.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/hildon-help-private.h b/src/hildon-help-private.h index e78c303..ed63a20 100644 --- a/src/hildon-help-private.h +++ b/src/hildon-help-private.h @@ -49,7 +49,13 @@ #include #include /* osso_context_t */ -#include /* gboolean */ +#include /* gboolean, GTK_WIDGET_REALIZED() */ + +/* Compatibility with older Gtk+ which didn't have gtk_widget_get_realized(), + * added in 2.20.0 */ +#ifdef GTK_WIDGET_REALIZED +#define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED(widget) +#endif /* --- Stuff that could come from GConf (but is not) --- */ diff --git a/src/osso-helplib.c b/src/osso-helplib.c index 7d62993..db7d74d 100644 --- a/src/osso-helplib.c +++ b/src/osso-helplib.c @@ -168,7 +168,7 @@ static void gtk_dialog_set_has_help(GtkDialog * dialog, gboolean has_help) g_return_if_fail(GTK_IS_DIALOG(dialog)); - if (!GTK_WIDGET_REALIZED(GTK_WIDGET(dialog))) { + if (!gtk_widget_get_realized(GTK_WIDGET(dialog))) { g_signal_handlers_disconnect_matched (dialog, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, dialog_on_realize, NULL) ; g_signal_connect (G_OBJECT (dialog), "realize", (GCallback)dialog_on_realize, (gpointer)GINT_TO_POINTER(has_help)) ; } else {