2005-01-22 [colin] 1.0.0cvs8.1
authorColin Leroy <colin@colino.net>
Sat, 22 Jan 2005 18:09:25 +0000 (18:09 +0000)
committerColin Leroy <colin@colino.net>
Sat, 22 Jan 2005 18:09:25 +0000 (18:09 +0000)
* src/summaryview.c
* src/gtk/quicksearch.c
Sync with HEAD

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/gtk/quicksearch.c
src/summaryview.c

index a586259..59767b3 100644 (file)
@@ -1,3 +1,9 @@
+2005-01-22 [colin]     1.0.0cvs8.1
+
+       * src/summaryview.c
+       * src/gtk/quicksearch.c
+               Sync with HEAD
+
 2005-01-21 [colin]     1.0.0cvs7.1
 
        * src/summaryview.c
index 861dda0..95b5ffa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/quicksearch.c; cvs diff -u -r 1.204.2.27 -r 1.204.2.28 src/prefs_common.c; cvs diff -u -r 1.103.2.10 -r 1.103.2.11 src/prefs_common.h; ) > 1.0.0cvs5.1.patchset
 ( cvs diff -u -r 1.395.2.43 -r 1.395.2.44 src/summaryview.c; ) > 1.0.0cvs6.1.patchset
 ( cvs diff -u -r 1.395.2.44 -r 1.395.2.45 src/summaryview.c; ) > 1.0.0cvs7.1.patchset
+( cvs diff -u -r 1.395.2.45 -r 1.395.2.46 src/summaryview.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/quicksearch.c; ) > 1.0.0cvs8.1.patchset
index 3a5a440..0cf4897 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
index 75cb912..01d5972 100644 (file)
@@ -771,7 +771,8 @@ static void quicksearch_reset_folder_items(QuickSearch *quicksearch,
 void quicksearch_reset_cur_folder_item(QuickSearch *quicksearch)
 {
        if (quicksearch->root_folder_item)
-               quicksearch_reset_folder_items(quicksearch, quicksearch->root_folder_item);
+               quicksearch_reset_folder_items(quicksearch, 
+                                              quicksearch->root_folder_item);
        
        quicksearch->root_folder_item = NULL;
 }
index aaf2621..76d037c 100644 (file)
@@ -791,7 +791,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        guint displayed_msgnum = 0;
        GSList *cur;
         GSList *not_killed;
-       gboolean quicksearch_changed = 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, "");
        }
 
-       if (quicksearch_is_running(summaryview->quicksearch))
-               quicksearch_changed = TRUE;
-
        /* 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();
+               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);
@@ -919,7 +924,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                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);