reset quick search condition if search bar is now shown.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1978 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cf430340..4c1142cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-11
 
+	* src/summaryview.c: reset quick search condition if search bar is
+	  not shown.
+
+2008-04-11
+
 	* src/gtkutils.h: added missing include.
 
 2008-04-10
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 560adb0d..75484485 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2008-04-11
 
+	* src/summaryview.c: 検索バーが表示されていない場合はクイック検索
+	  条件をリセットするようにした。
+
+2008-04-11
+
 	* src/gtkutils.h: include が抜けていたのを追加。
 
 2008-04-10
diff --git a/src/summaryview.c b/src/summaryview.c
index c38b5e86..e3bf6f2f 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -741,7 +741,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 	   create the thread */
 	summaryview->all_mlist = mlist;
 
-	if (prefs_common.persist_qsearch_filter || is_refresh) {
+	if (prefs_common.show_searchbar &&
+	    (prefs_common.persist_qsearch_filter || is_refresh)) {
 		if (item->qsearch_cond_type > QS_ALL)
 			do_qsearch = TRUE;
 		if (is_refresh) {
@@ -5215,6 +5216,7 @@ void summary_qsearch_reset(SummaryView *summaryview)
 	quick_search_clear_entry(summaryview->qsearch);
 	gtk_option_menu_set_history
 		(GTK_OPTION_MENU(summaryview->qsearch->optmenu), 0);
+	summaryview->folder_item->qsearch_cond_type = QS_ALL;
 
 	selected_msgnum = summary_get_msgnum(summaryview,
 					     summaryview->selected);