callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 761596 - Mail Advanced search only searches in Current folder

Browse Source
This commit is contained in:
Milan Crha
2016-02-18 19:51:13 +01:00
parent 975c49ec3f
commit f8cf90ef3d
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mail/e-mail-shell-view.c
View File

@ -702,7 +702,7 @@ all_accounts:
/* If the search text is empty, cancel any
* account-wide searches still in progress. */
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if ((text == NULL || *text == '\0') && !e_shell_view_get_search_rule (shell_view)) {
CamelStore *selected_store = NULL;
gchar *selected_folder_name = NULL;
@ -810,7 +810,7 @@ current_account:
/* If the search text is empty, cancel any
* account-wide searches still in progress. */
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if ((text == NULL || *text == '\0') && !e_shell_view_get_search_rule (shell_view)) {
CamelStore *selected_store = NULL;
gchar *selected_folder_name = NULL;
@ -1004,7 +1004,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
EMailReader *reader;
EMailView *mail_view;
GtkAction *action;
GtkActionGroup *action_group;
CamelStore *store = NULL;
GList *list, *link;
gchar *folder_name = NULL;
@ -1131,14 +1130,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
}
g_list_free (list);
action_group = E_SHELL_WINDOW_ACTION_GROUP_CUSTOM_RULES (shell_window);
sensitive = folder_is_selected && folder_tree_and_message_list_agree;
gtk_action_group_set_sensitive (action_group, sensitive);
action = E_SHELL_WINDOW_ACTION_SEARCH_ADVANCED (shell_window);
sensitive = folder_is_selected && folder_tree_and_message_list_agree;
gtk_action_set_sensitive (action, sensitive);
action = ACTION (MAIL_ACCOUNT_DISABLE);
sensitive = folder_is_store && store_can_be_disabled;
gtk_action_set_sensitive (action, sensitive);