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 /addressbook/gui/contact-editor | |
| parent | 495e9bf8001e2209a35e8991c07ec038576efdd4 (diff) | |
| download | gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.gz gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.bz2 gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.lz gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.xz 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 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 10 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 2973730788..501af7d97e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -43,7 +43,7 @@ #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "e-util/e-util.h" -#include "e-util/e-error.h" +#include "e-util/e-alert.h" #include "misc/e-dateedit.h" #include "misc/e-image-chooser.h" #include "misc/e-url-entry.h" @@ -2345,7 +2345,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) if ((height > 96 || width > 96)) { prompt_response = - e_error_run_dialog_for_args + e_alert_run_dialog_for_args (GTK_WINDOW (editor->app), "addressbook:prompt-resize", NULL); @@ -2773,7 +2773,7 @@ categories_clicked (GtkWidget *button, EContactEditor *editor) g_free (categories); return; }else if (!(dialog = GTK_DIALOG (e_categories_dialog_new (categories)))) { - e_error_run_dialog_for_args (GTK_WINDOW (editor->app), + e_alert_run_dialog_for_args (GTK_WINDOW (editor->app), "addressbook:edit-categories", NULL); g_free (categories); @@ -3061,7 +3061,7 @@ save_contact (EContactEditor *ce, gboolean should_close) return; if (ce->target_editable && !e_book_is_writable (ce->source_book)) { - if (e_error_run_dialog_for_args (GTK_WINDOW (ce->app), + if (e_alert_run_dialog_for_args (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO) return; @@ -3209,7 +3209,7 @@ e_contact_editor_is_valid (EABEditor *editor) if (validation_error) { g_string_append (errmsg, "."); - e_error_run_dialog_for_args (GTK_WINDOW (ce->app), + e_alert_run_dialog_for_args (GTK_WINDOW (ce->app), "addressbook:generic-error", _("Invalid contact."), errmsg->str, NULL); diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index ced2f2ec12..bc750d15ef 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -33,7 +33,7 @@ #include "e-contact-editor.h" #include "e-contact-quick-add.h" #include "eab-contact-merging.h" -#include "e-util/e-error.h" +#include "e-util/e-alert.h" typedef struct _QuickAdd QuickAdd; struct _QuickAdd { @@ -129,7 +129,7 @@ merge_cb (EBook *book, EBookStatus status, gpointer closure) if (e_book_is_writable (book)) eab_merging_book_add_contact (book, qa->contact, NULL, NULL); else - e_error_run_dialog_for_args (e_shell_get_active_window (NULL), + e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "addressbook:error-read-only", e_source_peek_name (e_book_get_source (book)), NULL); |