diff options
| author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 01:34:43 +0800 |
|---|---|---|
| committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 03:33:04 +0800 |
| commit | c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc (patch) | |
| tree | e6430bf480afc3e4a220fdf713413c8df4a9da41 /shell/e-shell-content.c | |
| parent | 495e9bf8001e2209a35e8991c07ec038576efdd4 (diff) | |
| download | gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.gz gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.zst gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.zip | |
Rename EError to EAlert to match general use better
The EError mechanism is used both for error dialogs as well as basic alerts or
user prompts, so we should give it a more general name which matches this use.
This patch also cleans up a few includes of e-alert.h (formerly e-error.h) that
were not actually being used.
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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index e10d1094c6..44d2ff9604 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -1472,7 +1472,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) ERuleContext *context; const gchar *user_filename; gint response; - EError *error = NULL; + EAlert *alert = NULL; g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); @@ -1517,10 +1517,10 @@ run: if (response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY) goto exit; - if (!e_filter_rule_validate (rule, &error)) { - e_error_run_dialog (GTK_WINDOW (dialog), error); - e_error_free (error); - error = NULL; + if (!e_filter_rule_validate (rule, &alert)) { + e_alert_run_dialog (GTK_WINDOW (dialog), alert); + e_alert_free (alert); + alert = NULL; goto run; } @@ -1576,7 +1576,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content) const gchar *user_filename; gchar *search_name; gint response; - EError *error = NULL; + EAlert *alert = NULL; g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); @@ -1625,10 +1625,10 @@ run: if (response != GTK_RESPONSE_OK) goto exit; - if (!e_filter_rule_validate (rule, &error)) { - e_error_run_dialog (GTK_WINDOW (dialog), error); - e_error_free (error); - error = NULL; + if (!e_filter_rule_validate (rule, &alert)) { + e_alert_run_dialog (GTK_WINDOW (dialog), alert); + e_alert_free (alert); + alert = NULL; goto run; } |