sync with 0.9.5cvs2

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 575dafb0951af82dd7e9bd8c8e8618b45d52c299..3dcb70186d05fb8ed7e4e3282b2ed0fb01c5646f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -933,16 +933,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
-       if (!is_refresh)
-               messageview_clear(summaryview->messageview);
 
        buf = NULL;
        if (!item || !item->path || !item->parent || item->no_select) {
                g_free(buf);
                debug_print("empty folder\n\n");
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               if (is_refresh)
-                       messageview_clear(summaryview->messageview);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
@@ -952,6 +948,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
        g_free(buf);
 
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
+
        summaryview->folder_item = item;
        item->opened = TRUE;
 
@@ -1211,6 +1210,7 @@ void summary_clear_list(SummaryView *summaryview)
 
 void summary_clear_all(SummaryView *summaryview)
 {
+       messageview_clear(summaryview->messageview);
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -4552,31 +4552,12 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        GtkWidget *hbox= summaryview->hbox_search;
-       GtkAllocation size = hbox->allocation;
-       GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
-       GtkAllocation parent_size = summaryview->vbox->allocation;
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
                prefs_common.show_searchbar = TRUE;
                gtk_widget_show(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        } else {
                prefs_common.show_searchbar = FALSE;
                gtk_widget_hide(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        }
 }