diff options
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 2 | ||||
| -rw-r--r-- | 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 a60d6db0a7..e1a221e10f 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 3e8bd9400b..1197623b71 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 ( |