[anjal] Anjal depends on Webkit 1.1.12. It has all that Anjal needs.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 52f7539e126a91c5c178428ba921e2ee9c700056
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue Aug 11 23:59:03 2009 +0530

    Anjal depends on Webkit 1.1.12. It has all that Anjal needs.

 configure.ac            |    2 +-
 src/em-webkit-stream.c  |    2 ++
 src/mail-message-view.c |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 39198d6..a6d8f0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_DEFINE_UNQUOTED(EVOLUTION_2_28, "$EVO_VERSION", [Evolution version])
 fi
 AC_DEFINE_UNQUOTED(EVOLUTION_VERSION, "$EVO_VERSION", [Evolution version])
 
-PKG_CHECK_MODULES(WEBKIT, [webkit-1.0],HAVE_WEBKIT="yes", HAVE_WEBKIT="no")
+PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= 1.1.12],HAVE_WEBKIT="yes", HAVE_WEBKIT="no")
 if test "x$HAVE_WEBKIT" = "xyes"; then
    AC_DEFINE(HAVE_WEBKIT, 1, [webkit available])
    AM_CONDITIONAL(ENABLE_WEBKIT, true)
diff --git a/src/em-webkit-stream.c b/src/em-webkit-stream.c
index 7097e2f..6765e9f 100644
--- a/src/em-webkit-stream.c
+++ b/src/em-webkit-stream.c
@@ -118,10 +118,12 @@ emws_sync_flush(CamelStream *stream)
 static int
 emws_sync_close(CamelStream *stream)
 {
+#if 0	
 	EMWebKitStream *emws = (EMWebKitStream *)stream;
 
 	if (emws->view && WEBKIT_IS_WEB_VIEW (emws->view)&&webkit_web_frame_get_height(webkit_web_view_get_main_frame(emws->view)))
 		gtk_widget_set_size_request ((GtkWidget *)emws->view, -1, webkit_web_frame_get_height(webkit_web_view_get_main_frame(emws->view)));
+#endif	
 	return 0;
 }
 
diff --git a/src/mail-message-view.c b/src/mail-message-view.c
index 371f648..e1e227b 100644
--- a/src/mail-message-view.c
+++ b/src/mail-message-view.c
@@ -649,7 +649,7 @@ mmv_finished_loading_webkit (WebKitWebView  *webkitwebview, WebKitWebFrame *arg1
 	// gtk_widget_hide (mmview->priv->table_headers);
 	// gtk_widget_show (mmview->priv->html_headers);
 	 gtk_widget_hide(mmview->priv->spinner);
-	gtk_widget_set_size_request ((GtkWidget *)webkitwebview, -1, webkit_web_frame_get_height(arg1));
+	/* gtk_widget_set_size_request ((GtkWidget *)webkitwebview, -1, webkit_web_frame_get_height(arg1)); */
 	/* Connect on expose, and mark mail as read on expose, when the mail is actually seen */
 	g_signal_connect (webkitwebview, "expose-event" , G_CALLBACK(mark_mail_read), mmview);
 	g_signal_emit (mmview, signals[MESSAGE_LOADED], 0);