[balsa] Do not hang with recent WebKit

[Peter Bloomfield <PeterB src gnome org>]

commit c4e63f07b90947145ffcffda3592feed42b9f150
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Nov 1 17:06:59 2009 -0500

    Do not hang with recent WebKit

 ChangeLog           |    9 +++++++++
 libbalsa/html.c     |   19 ++++++++++++-------
 src/balsa-message.c |    3 ++-
 3 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 271acd0..67d86c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-01  Peter Bloomfield
+
+	* libbalsa/html.c (lbh_size_request_cb): only increase the
+	requisition;
+	(lbh_navigation_policy_decision_requested_cb): be silent;
+	(libbalsa_html_new): indentation.
+	* src/balsa-message.c (add_part): give the content the surplus
+	space.
+
 2009-10-31  Peter Bloomfield
 
 	* libbalsa/html.c (lbh_navigation_policy_decision_requested_cb):
diff --git a/libbalsa/html.c b/libbalsa/html.c
index e98e527..1430ea0 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -107,9 +107,14 @@ lbh_size_request_cb(GtkWidget      * widget,
                     gpointer         data)
 {
     LibBalsaWebKitInfo *info = data;
+    gint upper;
 
-    requisition->width  = gtk_adjustment_get_upper(info->hadj);
-    requisition->height = gtk_adjustment_get_upper(info->vadj);
+    upper = gtk_adjustment_get_upper(info->hadj);
+    if (upper > requisition->width)
+        requisition->width = upper;
+    upper = gtk_adjustment_get_upper(info->vadj);
+    if (upper > requisition->height)
+        requisition->height = upper;
 }
 
 static gboolean
@@ -130,7 +135,6 @@ lbh_navigation_policy_decision_requested_cb(WebKitWebView             * web_view
          && reason == WEBKIT_WEB_NAVIGATION_REASON_OTHER)) {
         const gchar *uri = webkit_network_request_get_uri(request);
 
-        g_print("%s %s\n", __func__, uri);
         (*info->clicked_cb) (uri);
     }
 
@@ -202,9 +206,10 @@ lbh_create_web_view_cb(WebKitWebView  * web_view,
  */
 
 GtkWidget *
-libbalsa_html_new(const gchar * text, size_t len,
-		  const gchar * charset,
-		  gpointer message,
+libbalsa_html_new(const gchar        * text,
+                  size_t               len,
+                  const gchar        * charset,
+                  gpointer             message,
                   LibBalsaHtmlCallback hover_cb,
                   LibBalsaHtmlCallback clicked_cb)
 {
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 7dba5cb..659743e 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -2162,7 +2162,8 @@ add_part(BalsaMessage * bm, BalsaPartInfo * info)
 	    save = bm->bm_widget->container;
 	    bm->bm_widget->container = info->mime_widget->container;
 	} else
-	    gtk_box_pack_start(GTK_BOX(bm->bm_widget->container), info->mime_widget->widget, FALSE, FALSE, 0);
+	    gtk_box_pack_start(GTK_BOX(bm->bm_widget->container),
+                               info->mime_widget->widget, TRUE, TRUE, 0);
 	g_free(content_type);
     }