diff options
author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-11-25 06:55:54 +0800 |
---|---|---|
committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 03:31:19 +0800 |
commit | 0da239224f119664577c0d5dc47cab2632b083be (patch) | |
tree | d1979fdf65cbfed4e97f2047168259975d257dad /shell/e-shell-content.c | |
parent | fff91b3bc66758f21a4040d7ec198318333e5150 (diff) | |
download | gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar.gz gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar.bz2 gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar.lz gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar.xz gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.tar.zst gsoc2013-evolution-0da239224f119664577c0d5dc47cab2632b083be.zip |
port shell/ over to the new EError API
https://bugzilla.gnome.org/show_bug.cgi?id=602963
Diffstat (limited to 'shell/e-shell-content.c')
-rw-r--r-- | shell/e-shell-content.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 3640a2a5f4..e10d1094c6 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -1472,6 +1472,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) ERuleContext *context; const gchar *user_filename; gint response; + EError *error = NULL; g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); @@ -1516,8 +1517,12 @@ run: if (response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY) goto exit; - if (!e_filter_rule_validate (rule, GTK_WINDOW (dialog))) + if (!e_filter_rule_validate (rule, &error)) { + e_error_run_dialog (GTK_WINDOW (dialog), error); + e_error_free (error); + error = NULL; goto run; + } e_shell_content_set_search_rule (shell_content, rule); @@ -1571,6 +1576,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content) const gchar *user_filename; gchar *search_name; gint response; + EError *error = NULL; g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); @@ -1619,8 +1625,12 @@ run: if (response != GTK_RESPONSE_OK) goto exit; - if (!e_filter_rule_validate (rule, GTK_WINDOW (dialog))) + if (!e_filter_rule_validate (rule, &error)) { + e_error_run_dialog (GTK_WINDOW (dialog), error); + e_error_free (error); + error = NULL; goto run; + } e_rule_context_add_rule (context, rule); e_rule_context_save (context, user_filename); |