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

I#1562 - Mail: Global search prevents execution of the saved searches

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1562
This commit is contained in:
Milan Crha
2021-07-23 11:15:26 +02:00
parent ab804beb51
commit e38045230c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/mail/e-mail-shell-view-private.c
View File

@ -781,6 +781,7 @@ e_mail_shell_view_restore_state (EMailShellView *mail_shell_view)
gchar *folder_uri; gchar *folder_uri;
gchar *tmp = NULL; gchar *tmp = NULL;
GSettings *settings; GSettings *settings;
GtkWidget *message_list;
/* XXX Move this to EMailShellContent. */ /* XXX Move this to EMailShellContent. */
@ -829,9 +830,11 @@ e_mail_shell_view_restore_state (EMailShellView *mail_shell_view)
} }
old_state_group = e_shell_searchbar_get_state_group (searchbar); old_state_group = e_shell_searchbar_get_state_group (searchbar);
message_list = e_mail_reader_get_message_list (reader);
/* Avoid loading search state unnecessarily, unless it's the global search. */ /* Avoid loading search state unnecessarily. */
if (!tmp || g_strcmp0 (new_state_group, old_state_group) != 0) { if ((!tmp && IS_MESSAGE_LIST (message_list) && MESSAGE_LIST (message_list)->just_set_folder) ||
g_strcmp0 (new_state_group, old_state_group) != 0) {
e_shell_searchbar_set_state_group (searchbar, new_state_group); e_shell_searchbar_set_state_group (searchbar, new_state_group);
e_shell_searchbar_load_state (searchbar); e_shell_searchbar_load_state (searchbar);
} }