From e4cce2eeae7889b82ff9a1da5d4062a83f2cbdf7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 Apr 2012 12:49:46 +0200 Subject: Bug #564820 - Search filter persists when changing folders --- modules/mail/e-mail-shell-view-private.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 9a58f9d2b7..e043d7d49e 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -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 -- cgit v1.2.3