[Commits] [SCM] claws branch, master, updated. 3.10.0-39-gf9985ae

[claws at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  f9985ae65ffaad270013e2ecb618e4556a4411e3 (commit)
      from  1acda3610917af3bfb9b1e6a1ce0285317cb00cd (commit)


- Log -----------------------------------------------------------------
commit f9985ae65ffaad270013e2ecb618e4556a4411e3
Author: Paul <paul at claws-mail.org>
Date:   Tue Jun 3 17:56:15 2014 +0100

    fix bug 3170, 'QuickSearch fights with View/Hide read threads menu option'

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7b71254..62b380a 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3316,10 +3316,14 @@ do { \
 
 	if (mainwin->summaryview->folder_item && !mainwin->summaryview->folder_item->threaded)
 		cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE);
-	if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs)
+	if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs) ||
+	    quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
 		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE);
-	if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads)
+	if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads) ||
+	    quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
 		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadMessages", FALSE);
+	if (quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch))
+		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideDelMessages", FALSE);
 
 	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Goto/PrevHistory",
 		messageview_nav_has_prev(mainwin->messageview));

-----------------------------------------------------------------------

Summary of changes:
 src/mainwindow.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail