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 /mail/mail-vfolder.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 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 4fabc848c0..4ab49d1869 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -32,7 +32,7 @@ #include <camel/camel-vtrash-folder.h> #include <libedataserver/e-account-list.h> -#include "e-util/e-error.h" +#include "e-util/e-alert.h" #include "e-util/e-util-private.h" #include "e-util/e-account-utils.h" @@ -600,7 +600,7 @@ done: const gchar *data_dir; gchar *user; - dialog = e_error_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", changed->str, uri, NULL); + dialog = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-updated", changed->str, uri, NULL); em_utils_show_info_silent (dialog); data_dir = em_utils_get_data_dir (); @@ -1094,7 +1094,7 @@ vfolder_edit_rule(const gchar *uri) GtkWidget *w; /* TODO: we should probably just create it ... */ - w = e_error_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-notexist", uri, NULL); + w = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), "mail:vfolder-notexist", uri, NULL); em_utils_show_error_silent (w); } @@ -1109,16 +1109,16 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data) const gchar *data_dir; gchar *user; EFilterRule *rule = g_object_get_data((GObject *)w, "rule"); - EError *error = NULL; + EAlert *alert = NULL; - if (!e_filter_rule_validate (rule, &error)) { - e_error_run_dialog (GTK_WINDOW (w), error); - e_error_free (error); + if (!e_filter_rule_validate (rule, &alert)) { + e_alert_run_dialog (GTK_WINDOW (w), alert); + e_alert_free (alert); return; } if (e_rule_context_find_rule ((ERuleContext *)context, rule->name, rule->source)) { - e_error_run_dialog_for_args ((GtkWindow *)w, "mail:vfolder-notunique", rule->name, NULL); + e_alert_run_dialog_for_args ((GtkWindow *)w, "mail:vfolder-notunique", rule->name, NULL); return; } |