Sync with hiro's cvs 10 to 17.

[claws.git] / src / summary_search.c

diff --git a/src/summary_search.c b/src/summary_search.c
index a962e29d4a9c658b60f2fde4b2782f70ee3e7a59..2f31620bc929a05da3bc157d775794c27e28cdc8 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -75,6 +75,8 @@ void summary_search(SummaryView *summaryview)
 {
        if (!window)
                summary_search_create(summaryview);
+       else
+               gtk_widget_hide(window);
 
        gtk_widget_grab_focus(search_btn);
        gtk_widget_grab_focus(subject_entry);
@@ -93,9 +95,8 @@ static void summary_search_create(SummaryView *summaryview)
        GtkWidget *confirm_area;
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_window_set_title (GTK_WINDOW (window), _("Search folder"));
+       gtk_window_set_title (GTK_WINDOW (window), _("Search messages"));
        gtk_widget_set_usize (window, 450, -1);
-       /*gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);*/
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
@@ -350,11 +351,17 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                        if (search_all)
                                gtk_ctree_select(ctree, node);
                        else {
-                               summary_select_node(summaryview, node, TRUE);
-                               if (body_matched) {
-                                       messageview_search_string
-                                               (summaryview->messageview,
-                                                body_str, case_sens);
+                               if (summaryview->msg_is_toggled_on) {
+                                       summary_select_node
+                                               (summaryview, node, TRUE);
+                                       if (body_matched) {
+                                               messageview_search_string
+                                                       (summaryview->messageview,
+                                                        body_str, case_sens);
+                                       }
+                               } else {
+                                       summary_select_node
+                                               (summaryview, node, FALSE);
                                }
                                break;
                        }