[anjal] Fix broken search with evolution master.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 58deac1acbcbf6d87929fd8a4f5274de211cface
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Wed Feb 10 22:49:44 2010 +0530

    Fix broken search with evolution master.

 src/mail-view.c                       |    2 +-
 src/module/anjal-shell-view-private.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/mail-view.c b/src/mail-view.c
index a14140e..cb6afb6 100644
--- a/src/mail-view.c
+++ b/src/mail-view.c
@@ -887,7 +887,7 @@ mail_view_set_search (MailView *mv, const char *search)
 {
 	MailViewChild *child = (MailViewChild *)mv->priv->current_view;
 
-	if (child->type == MAIL_VIEW_FOLDER) {
+	if (child && child->type == MAIL_VIEW_FOLDER) {
 		MailFolderView *mfv = (MailFolderView *)child;
 
 		mail_folder_view_set_search (mfv, search, e_shell_searchbar_get_search_text ((EShellSearchbar *)mv->priv->search_entry));
diff --git a/src/module/anjal-shell-view-private.c b/src/module/anjal-shell-view-private.c
index 1832af6..6b1ff96 100644
--- a/src/module/anjal-shell-view-private.c
+++ b/src/module/anjal-shell-view-private.c
@@ -352,7 +352,8 @@ anjal_shell_view_restore_state (AnjalShellView *mail_shell_view, const char *fol
 	searchbar = (EShellSearchbar *)e_shell_content_get_searchbar (shell_content);
 
 	group_name = g_strdup_printf ("Folder %s", folder_uri);
-	e_shell_searchbar_restore_state (searchbar, group_name);
+	e_shell_searchbar_set_state_group (searchbar, group_name);
+	e_shell_searchbar_load_state (searchbar);
 	g_free (group_name);
 }