[balsa/gtk3] Fix bz #647695; Pawel's patch with one change

[Peter Bloomfield <PeterB src gnome org>]

commit fa411766baa4f12b4bac3189b6fa38ee281fc6be
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Apr 15 21:31:43 2011 -0400

    Fix bz #647695; Pawel's patch with one change
    
    	Fix bz #647695; Pawel's patch for master, with one change.
    
    	* src/balsa-message.c (bm_find_bar_new), (balsa_message_init),
    	(balsa_message_find_in_message): show all of the widget before
    	adding the find bar.
    	* src/message-window.c (message_window_new): show the widget,
    	not show all.

 ChangeLog            |   10 ++++++++++
 src/balsa-message.c  |   14 +++++---------
 src/message-window.c |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5c6c136..3fb9a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-15  Peter Bloomfield
+
+	Fix bz #647695; Pawel's patch for master, with one change.
+
+	* src/balsa-message.c (bm_find_bar_new), (balsa_message_init),
+	(balsa_message_find_in_message): show all of the widget before
+	adding the find bar.
+	* src/message-window.c (message_window_new): show the widget,
+	not show all.
+
 2011-04-14  Peter Bloomfield
 
 	* src/save-restore.c (config_defclient_save): fix launch
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 5bb9dc4..55ee21b 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -611,8 +611,6 @@ bm_find_bar_new(BalsaMessage * bm)
     gtk_container_add(GTK_CONTAINER(tool_item), bm->find_label);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_item, -1);
 
-    gtk_widget_hide(toolbar);
-
     return toolbar;
 }
 
@@ -687,16 +685,11 @@ balsa_message_init(BalsaMessage * bm)
     gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
     bm->cont_viewport = gtk_viewport_new(NULL, NULL);
     gtk_container_add(GTK_CONTAINER(scroll), bm->cont_viewport);
-    gtk_widget_show_all(scroll);
     g_signal_connect_after(bm, "style-updated",
 			   G_CALLBACK(bm_on_set_style), bm);
     g_signal_connect(bm->cont_viewport, "size-allocate",
 		     G_CALLBACK(on_content_size_alloc), NULL);
 
-    /* Find-in-message toolbar */
-    bm->find_bar = bm_find_bar_new(bm);
-    gtk_box_pack_start(GTK_BOX(vbox), bm->find_bar, FALSE, FALSE, 0);
-
     /* Widget to hold headers */
     bm->bm_widget = balsa_mime_widget_new_message_tl(bm, bm_header_tl_buttons(bm));
 
@@ -781,7 +774,10 @@ balsa_message_init(BalsaMessage * bm)
     bm->close_with_msg = FALSE;
 
     gtk_widget_show_all(GTK_WIDGET(bm));
-    gtk_widget_hide(bm->find_bar);
+
+    /* Find-in-message toolbar that is hidden by default. */
+    bm->find_bar = bm_find_bar_new(bm);
+    gtk_box_pack_start(GTK_BOX(vbox), bm->find_bar, FALSE, FALSE, 0);
 }
 
 static void
@@ -3260,7 +3256,7 @@ balsa_message_find_in_message(BalsaMessage * bm)
 
         bm_find_set_status(bm, BM_FIND_STATUS_INIT);
 
-        gtk_widget_show(bm->find_bar);
+        gtk_widget_show_all(bm->find_bar);
         if (gtk_widget_get_window(bm->find_entry))
             gtk_widget_grab_focus(bm->find_entry);
     }
diff --git a/src/message-window.c b/src/message-window.c
index 651ecae..fa9e02b 100644
--- a/src/message-window.c
+++ b/src/message-window.c
@@ -622,7 +622,7 @@ message_window_new(LibBalsaMailbox * mailbox, guint msgno)
     mw->bmessage = balsa_message_new();
     
     gtk_box_pack_start(GTK_BOX(vbox), mw->bmessage, TRUE, TRUE, 0);
-    gtk_widget_show_all(vbox);
+    gtk_widget_show(vbox);
 
     g_signal_connect(mw->bmessage, "select-part",
 		     G_CALLBACK(mw_select_part_cb), mw);