2005-01-22 [colin] 1.0.0cvs8.1

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index aaf262129bef287593bbb7a68b456db6f3127150..76d037cffb75093ebd4ed4d2c0b4ef2710018e62 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -791,7 +791,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        guint displayed_msgnum = 0;
        GSList *cur;
         GSList *not_killed;
        guint displayed_msgnum = 0;
        GSList *cur;
         GSList *not_killed;

-       gboolean quicksearch_changed = FALSE;

 
        if (summary_is_locked(summaryview)) return FALSE;
 
 
        if (summary_is_locked(summaryview)) return FALSE;
 


@@ -804,9 +803,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
        }
 
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
        }
 

-       if (quicksearch_is_running(summaryview->quicksearch))
-               quicksearch_changed = TRUE;
-

        /* STATUSBAR_POP(summaryview->mainwin); */
 
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
        /* STATUSBAR_POP(summaryview->mainwin); */
 
        is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;


@@ -857,6 +853,15 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_unlock(summaryview);
                inc_unlock();
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_unlock(summaryview);
                inc_unlock();

+               if (item && quicksearch_is_running(summaryview->quicksearch)) {
+                       main_window_cursor_wait(summaryview->mainwin);
+                       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+                       if (quicksearch_is_active(summaryview->quicksearch))
+                               quicksearch_search_subfolders(summaryview->quicksearch, 
+                                             summaryview->folderview,
+                                             summaryview->folder_item);
+                       main_window_cursor_normal(summaryview->mainwin);
+               }                       

                return TRUE;
        }
        g_free(buf);
                return TRUE;
        }
        g_free(buf);


@@ -919,7 +924,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                procmsg_msginfo_free(msginfo);
                }
                
                                procmsg_msginfo_free(msginfo);
                }
                

-               if (quicksearch_changed) {
+               if (quicksearch_is_running(summaryview->quicksearch)) {

                        /* only scan subfolders when quicksearch changed,
                         * not when search is the same and folder changed */
                        main_window_cursor_wait(summaryview->mainwin);
                        /* only scan subfolders when quicksearch changed,
                         * not when search is the same and folder changed */
                        main_window_cursor_wait(summaryview->mainwin);