Disable DnD in gtkhtml for hildon2 (fixes NB#109753)

pmo-trunk-r8761

diff --git a/configure.ac b/configure.ac
index 0b4cb9e..45bdd8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,8 @@ AC_CHECK_FUNCS(gtk_html_set_max_image_size)
 AC_SUBST(HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE)
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
 AC_SUBST(HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE)
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)

+AC_CHECK_FUNCS(gtk_html_set_allow_dnd)
+AC_SUBST(HAVE_GTK_HTML_SET_ALLOW_DND)

 AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
 CFLAGS="$modest_save_cflags"
 AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
 CFLAGS="$modest_save_cflags"

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 54c9b2e..9c584b7 100644 (file)
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -285,6 +285,9 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
           maximum height of 2 times the full size of the window. Should be enough */
        gtk_html_set_max_image_size (GTK_HTML (self), 720, 880);
 #endif
           maximum height of 2 times the full size of the window. Should be enough */
        gtk_html_set_max_image_size (GTK_HTML (self), 720, 880);
 #endif

+#ifdef HAVE_GTK_HTML_SET_ALLOW_DND
+       gtk_html_set_allow_dnd       (GTK_HTML(self), FALSE);
+#endif

 #endif
 
        gdk_color_parse ("#fff", &base);
 #endif
 
        gdk_color_parse ("#fff", &base);