balsa-gtkhtml4.patch

   1 --- balsa-2.4.9/configure.in~   2010-11-18 23:18:23.000000000 +0100
   2 +++ balsa-2.4.9/configure.in    2011-04-06 16:06:54.083684399 +0200
   3 @@ -124,10 +124,10 @@
   4                    [with_gss=$withval],[with_gss=no])
   5
   6  AC_ARG_WITH(html-widget,
   7 -            AC_HELP_STRING([--with-html-widget=(no|gtkhtml2|gtkhtml3|webkit)],
   8 -                           [select the HTML renderer (default gtkhtml3)]),
   9 +            AC_HELP_STRING([--with-html-widget=(no|gtkhtml2|gtkhtml3|gtkhtml4|webkit)],
  10 +                           [select the HTML renderer (default gtkhtml4)]),
  11              [use_html_widget=$withval],
  12 -            [use_html_widget=gtkhtml3])
  13 +            [use_html_widget=gtkhtml4])
  14
  15  AC_ARG_WITH([gtksourceview],
  16     AC_HELP_STRING([--with-gtksourceview],
  17 @@ -385,6 +385,11 @@
  18          PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ])
  19          AC_DEFINE(HAVE_GTKHTML3,1,[Defined when GtkHtml-3 can be used.])
  20      ;;
  21 +    gtkhtml4)
  22 +        AC_MSG_RESULT([$use_html_widget])
  23 +       PKG_CHECK_MODULES(HTML, [ libgtkhtml-4.0 ])
  24 +       AC_DEFINE(HAVE_GTKHTML4,1,[Defined when GtkHtml-4 can be used.])
  25 +    ;;
  26      webkit)
  27          AC_MSG_RESULT([$use_html_widget])
  28          if ! $PKG_CONFIG --atleast-version=1.1.14 webkit-1.0; then
  29 --- balsa-2.4.9/libbalsa/html.c~        2010-11-18 21:55:32.000000000 +0100
  30 +++ balsa-2.4.9/libbalsa/html.c 2011-04-06 16:10:07.390356929 +0200
  31 @@ -745,9 +745,9 @@
  32      requisition->height = gtk_adjustment_get_upper(adjustment);
  33  }
  34
  35 -# ifdef HAVE_GTKHTML3
  36 +# ifdef HAVE_GTKHTML3 || HAVE_GTKHTML4
  37
  38 -/* Code for GtkHTML-3 */
  39 +/* Code for GtkHTML-3 and GtkHTML-4*/
  40
  41  #  include <gtkhtml/gtkhtml.h>
  42  #  include <gtkhtml/gtkhtml-stream.h>