From: Colin Leroy <colin@colino.net>
Date: Sat, 22 Jan 2005 18:09:25 +0000 (+0000)
Subject: 2005-01-22 [colin]	1.0.0cvs8.1
X-Git-Tag: rel_1_9_6~89
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d017c1986b6e828187c43f17ee19ab8f31d0f45c;hp=4f0efd0cfc908a208ac8350cd026468870b0b5ba

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

	* src/summaryview.c
	* src/gtk/quicksearch.c
		Sync with HEAD
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index a58625932..59767b385 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -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
diff --git a/PATCHSETS b/PATCHSETS
index 861dda048..95b5ffad3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -336,3 +336,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
index 3a5a440be..0cf489713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 75cb912aa..01d5972ff 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -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;
 }
diff --git a/src/summaryview.c b/src/summaryview.c
index aaf262129..76d037cff 100644
--- 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;
-	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);