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

Bug #564820 - Search filter persists when changing folders

Browse Source
This commit is contained in:
Milan Crha
2012-04-23 12:49:46 +02:00
parent 12256b4f1c
commit e4cce2eeae
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail/message-list.c
View File

@ -3850,6 +3850,12 @@ message_list_set_folder (MessageList *message_list,
if (message_list->folder == folder)
return;
g_free (message_list->search);
message_list->search = NULL;
g_free (message_list->frozen_search);
message_list->frozen_search = NULL;
if (message_list->seen_id) {
g_source_remove (message_list->seen_id);
message_list->seen_id = 0;

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

@ -852,8 +852,13 @@ e_mail_shell_view_restore_state (EMailShellView *mail_shell_view)
reader = E_MAIL_READER (mail_view);
folder = e_mail_reader_get_folder (reader);
if (folder == NULL)
if (folder == NULL) {
if (e_shell_searchbar_get_state_group (searchbar)) {
e_shell_searchbar_set_state_group (searchbar, NULL);
e_shell_searchbar_load_state (searchbar);
}
return;
}
/* Do not restore state if we're running a "Current Account"
* or "All Accounts" search, since we don't want the search