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
This commit is contained in:
@ -29,7 +29,6 @@
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
||||
#include "e-util/e-error.h"
|
||||
#include "e-util/e-import.h"
|
||||
#include "e-util/e-util-private.h"
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include <e-util/e-error.h>
|
||||
#include <e-util/e-alert.h>
|
||||
#include <e-util/e-signature-utils.h>
|
||||
|
||||
#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);
|
||||
|
||||
Reference in New Issue
Block a user