sync with 0.7.5cvs3

[claws.git] / src / summary_search.c

diff --git a/src/summary_search.c b/src/summary_search.c
index 568b8895eb8b185e87db406fa43015d5be84d3d3..8ae35104ca1ec3b35698c37443595910e1931499 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -232,6 +232,9 @@ static void summary_search_execute(GtkButton *button, gpointer data)
        wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
                                  const wchar_t *needle);
 
        wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
                                  const wchar_t *needle);
 

+       if (summary_is_locked(summaryview)) return;
+       summary_lock(summaryview);
+

        case_sens = gtk_toggle_button_get_active
                (GTK_TOGGLE_BUTTON(case_checkbtn));
        backward = gtk_toggle_button_get_active
        case_sens = gtk_toggle_button_get_active
                (GTK_TOGGLE_BUTTON(case_checkbtn));
        backward = gtk_toggle_button_get_active


@@ -267,7 +270,10 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                else
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
                else
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 

-               if (!node) return;
+               if (!node) {
+                       summary_unlock(summaryview);
+                       return;
+               }

        } else {
                if (backward)
                        node = GTK_CTREE_NODE_PREV(summaryview->selected);
        } else {
                if (backward)
                        node = GTK_CTREE_NODE_PREV(summaryview->selected);


@@ -370,6 +376,8 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 
        if (*body_str)
                main_window_cursor_normal(summaryview->mainwin);
 
        if (*body_str)
                main_window_cursor_normal(summaryview->mainwin);

+
+       summary_unlock(summaryview);

 }
 
 static void summary_search_clear(GtkButton *button, gpointer data)
 }
 
 static void summary_search_clear(GtkButton *button, gpointer data)