[balsa] Fix bug 647695

[Pawel Salek <pawels src gnome org>]

commit ddc348d364fe60ebb937a6f89b49b89c578ce344
Author: Pawel Salek <pawsa0 gmail com>
Date:   Fri Apr 15 20:21:01 2011 +0200

    Fix bug 647695
    
    * src/balsa-message.c:
    * src/message-window.c: fix bug 647695.
    * libbalsa/imap/imap-handle.c: remove unused variable.

 ChangeLog                   |    6 ++++++
 libbalsa/imap/imap-handle.c |    2 --
 src/balsa-message.c         |   11 ++++-------
 src/message-window.c        |    2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 60bcbfa..0074906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-15  Pawel Salek
+
+	* src/balsa-message.c:
+	* src/message-window.c: fix bug 647695.
+	* libbalsa/imap/imap-handle.c: remove unused variable.
+
 2011-03-29  Peter Bloomfield
 
 	* src/main-window.c: implement alt-n to switch to mailbox at
diff --git a/libbalsa/imap/imap-handle.c b/libbalsa/imap/imap-handle.c
index 3922217..8308f29 100644
--- a/libbalsa/imap/imap-handle.c
+++ b/libbalsa/imap/imap-handle.c
@@ -2779,7 +2779,6 @@ static ImapResponse
 ir_esearch(ImapMboxHandle *h)
 {
   char atom[LONG_STRING];
-  int uid_data = 0;
   int c = sio_getc(h->sio);
   if(c == '(') { /* search correlator */
     gchar *str;
@@ -2806,7 +2805,6 @@ ir_esearch(ImapMboxHandle *h)
   c = imap_get_atom(h->sio, atom, sizeof(atom));
 
   if(g_ascii_strcasecmp(atom, "UID") == 0) {
-    uid_data = 1;
     c = imap_get_atom(h->sio, atom, sizeof(atom));
   }
   if(c == EOF) return IMR_SEVERED;
diff --git a/src/balsa-message.c b/src/balsa-message.c
index d4ce194..f5eb7ae 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -636,8 +636,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;
 }
 
@@ -732,7 +730,9 @@ balsa_message_init(BalsaMessage * bm)
     g_signal_connect(bm->cont_viewport, "size-allocate",
 		     G_CALLBACK(on_content_size_alloc), NULL);
 
-    /* Find-in-message toolbar */
+    gtk_widget_show_all(GTK_WIDGET(bm));
+
+    /* 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);
 
@@ -819,9 +819,6 @@ balsa_message_init(BalsaMessage * bm)
     bm->wrap_text = balsa_app.browse_wrap;
     bm->shown_headers = balsa_app.shown_headers;
     bm->close_with_msg = FALSE;
-
-    gtk_widget_show_all(GTK_WIDGET(bm));
-    gtk_widget_hide(bm->find_bar);
 }
 
 static void
@@ -3312,7 +3309,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 199ee9b..760a6db 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);