From d6e173eccef9f61733456b2f227ce77aa35588a2 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 3 Dec 2007 17:24:55 +0000 Subject: [PATCH] * modest-detect-tap-and-hold: - patch contributed by Loic Minier to check for the existence of tap-and-old instead of MAEMO_CHANGES pmo-trunk-r3856 --- configure.ac | 8 ++++++++ src/widgets/modest-mozembed-msg-view.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index dde527c..d9239a5 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,14 @@ PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gcon AC_SUBST(MODEST_GSTUFF_CFLAGS) AC_SUBST(MODEST_GSTUFF_LIBS) +modest_save_cflags="$CFLAGS" +modest_save_libs="$LIBS" +CFLAGS="$MODEST_GSTUFF_CFLAGS" +LIBS="$MODEST_GSTUFF_LIBS" +AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include ]) +CFLAGS="$modest_save_cflags" +LIBS="$modest_save_libs" + __COPY_LIBS="$LIBS" LIBS="$LIBS $MODEST_GSTUFF_LIBS" AC_CHECK_FUNCS(gtk_html_get_selection_area) diff --git a/src/widgets/modest-mozembed-msg-view.c b/src/widgets/modest-mozembed-msg-view.c index b88f167..d843acb 100644 --- a/src/widgets/modest-mozembed-msg-view.c +++ b/src/widgets/modest-mozembed-msg-view.c @@ -71,9 +71,9 @@ static gboolean on_fetch_url (GtkWidget *widget, const gchar *uri, TnyStream *st ModestMozembedMsgView *msg_view); static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMozembedMsgView *msg_view); -#ifdef MAEMO_CHANGES +#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP static void on_tap_and_hold (GtkWidget *widget, gpointer userdata); -#endif /*MAEMO_CHANGES*/ +#endif /*HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP*/ /* TnyMimePartView implementation */ static void modest_msg_view_mp_clear (TnyMimePartView *self); @@ -381,7 +381,7 @@ modest_mozembed_msg_view_init (ModestMozembedMsgView *obj) /* gtk_container_add (GTK_CONTAINER (scroll_area), priv->body_view); */ /* gtk_container_add (GTK_CONTAINER (body_box), scroll_area); */ -#ifdef MAEMO_CHANGES +#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0); g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold", G_CALLBACK (on_tap_and_hold), obj); #endif @@ -482,7 +482,7 @@ modest_mozembed_msg_view_new (TnyMsg *msg) return GTK_WIDGET(self); } -#ifdef MAEMO_CHANGES +#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP static void on_tap_and_hold (GtkWidget *widget, gpointer data) -- 1.7.9.5