From bfc4088a520e499a2b202b7d761fd609ce2b5b7e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 5 Feb 2004 17:49:12 +0000 Subject: Always set the search_state, even if it is NULL (NULL means default/unset 2004-02-05 Jeffrey Stedfast * em-folder-browser.c (emfb_set_folder): Always set the search_state, even if it is NULL (NULL means default/unset state). svn path=/trunk/; revision=24634 --- mail/ChangeLog | 3 +++ mail/em-folder-browser.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 52ad594ab6..3920a0d3fc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2004-02-05 Jeffrey Stedfast + * em-folder-browser.c (emfb_set_folder): Always set the + search_state, even if it is NULL (NULL means default/unset state). + * em-folder-view.c (emfv_mail_next_flagged): Pass TRUE as wraparound (to both be consistant with prev_flagged and to fix bug #48681. diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index dad3f651cd..745c44fa17 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -922,10 +922,9 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) g_free (sstate); } - if ((sstate = camel_object_meta_get (folder, "evolution:search_state"))) { - g_object_set (emfb->search, "state", sstate, NULL); - g_free (sstate); - } + sstate = camel_object_meta_get (folder, "evolution:search_state"); + g_object_set (emfb->search, "state", sstate, NULL); + g_free (sstate); if ((sstate = camel_object_meta_get (folder, "evolution:selected_uid"))) emfb->priv->select_uid = sstate; -- cgit v1.2.3