[evolution] Fix few compiler warnings

[Milan Crha <mcrha src gnome org>]

commit c75bacce45e0cad3ea01d506472d7d1d9ef9611a
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 3 13:06:38 2009 +0100

    Fix few compiler warnings

 modules/mail/e-mail-shell-view.c |    2 +-
 shell/e-shell-view.c             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index a60d6db..e1a221e 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -336,7 +336,7 @@ filter:
 			break;
 	}
 
-	search_rule = e_shell_content_get_search_rule (mail_shell_content);
+	search_rule = e_shell_content_get_search_rule (shell_content);
 	if (search_rule != NULL) {
 		string = g_string_sized_new (1024);
 		e_filter_rule_build_code (search_rule, string);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 3e8bd94..1197623 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1148,13 +1148,13 @@ e_shell_view_show_popup_menu (EShellView *shell_view,
 	EShellWindow *shell_window;
 	GtkWidget *menu;
 
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
+	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
 
 	e_shell_view_update_actions (shell_view);
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	menu = e_shell_window_get_managed_widget (shell_window, widget_path);
-	g_return_if_fail (GTK_IS_MENU (menu));
+	g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
 
 	if (event != NULL)
 		gtk_menu_popup (