From c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Mon, 30 Nov 2009 11:34:43 -0600 Subject: 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 --- widgets/misc/e-import-assistant.c | 1 - widgets/misc/e-signature-editor.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 2a1b980eb5..4e61799512 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -29,7 +29,6 @@ #include #include -#include "e-util/e-error.h" #include "e-util/e-import.h" #include "e-util/e-util-private.h" diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index b5de5042ba..49ce3c6a32 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #define E_SIGNATURE_EDITOR_GET_PRIVATE(obj) \ @@ -89,7 +89,7 @@ action_close_cb (GtkAction *action, if (something_changed) { gint response; - response = e_error_run_dialog_for_args ( + response = e_alert_run_dialog_for_args ( GTK_WINDOW (editor), "mail:ask-signature-changed", NULL); if (response == GTK_RESPONSE_YES) { @@ -144,7 +144,7 @@ action_save_and_close_cb (GtkAction *action, gtkhtml_editor_save (GTKHTML_EDITOR (editor), filename, html, &error); if (error != NULL) { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (editor), "mail:no-save-signature", error->message, NULL); @@ -159,7 +159,7 @@ action_save_and_close_cb (GtkAction *action, /* Make sure the signature name is not blank. */ if (*signature_name == '\0') { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (editor), "mail:blank-signature", NULL); gtk_widget_grab_focus (entry); @@ -172,7 +172,7 @@ action_save_and_close_cb (GtkAction *action, same_name = (ESignature *) e_signature_list_find ( signature_list, E_SIGNATURE_FIND_NAME, signature_name); if (same_name != NULL && !e_signature_is_equal (signature, same_name)) { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (editor), "mail:signature-already-exists", signature_name, NULL); -- cgit