aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/backup-restore
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-12-01 01:34:43 +0800
committerJonathon Jongsma <jonathon@quotidian.org>2009-12-01 03:33:04 +0800
commitc2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc (patch)
treee6430bf480afc3e4a220fdf713413c8df4a9da41 /plugins/backup-restore
parent495e9bf8001e2209a35e8991c07ec038576efdd4 (diff)
downloadgsoc2013-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 'plugins/backup-restore')
-rw-r--r--plugins/backup-restore/backup-restore.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 19905a6537..9f3413cbbe 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -33,7 +33,7 @@
#include <glib/gstdio.h>
#include "mail/em-config.h"
#include "mail/em-account-editor.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "e-util/e-util.h"
#include "e-util/e-dialog-utils.h"
#include "shell/e-shell-utils.h"
@@ -101,14 +101,14 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, con
va_list ap;
gint button;
guint32 mask = 0;
- EError *error = NULL;
+ EAlert *alert = NULL;
va_start(ap, arg0);
- error = e_error_newv(tag, arg0, ap);
+ alert = e_alert_newv(tag, arg0, ap);
va_end(ap);
- mbox = e_error_new_dialog (parent, error);
- e_error_free (error);
+ mbox = e_alert_new_dialog (parent, alert);
+ e_alert_free (alert);
check = gtk_check_button_new_with_mnemonic (string);
/* We should hardcode this to true */
@@ -188,7 +188,7 @@ action_settings_backup_cb (GtkAction *action,
g_free (path);
}
} else {
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"org.gnome.backup-restore:insufficient-permissions", NULL);
}
@@ -224,7 +224,7 @@ action_settings_restore_cb (GtkAction *action,
if (mask & BR_OK)
restore (path, mask & BR_START);
} else {
- e_error_run_dialog_for_args (
+ e_alert_run_dialog_for_args (
GTK_WINDOW (shell_window),
"org.gnome.backup-restore:invalid-backup", NULL);
}
@@ -331,7 +331,7 @@ backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target)
if (state) {
if (!file || !sanity_check (file)) {
- e_error_run_dialog_for_args ((GtkWindow *)assistant,
+ e_alert_run_dialog_for_args ((GtkWindow *)assistant,
"org.gnome.backup-restore:invalid-backup",
NULL);
} else {