From 68d3608b81c2a980cd13352badfcfcfe59477c94 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Tue, 24 Nov 2009 18:11:23 -0600 Subject: port plugins to use new EError API https://bugzilla.gnome.org/show_bug.cgi?id=602963 --- plugins/backup-restore/backup-restore.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'plugins/backup-restore/backup-restore.c') diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index f02e0d8565..19905a6537 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -101,11 +101,15 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, con va_list ap; gint button; guint32 mask = 0; + EError *error = NULL; va_start(ap, arg0); - mbox = e_error_newv(parent, tag, arg0, ap); + error = e_error_newv(tag, arg0, ap); va_end(ap); + mbox = e_error_new_dialog (parent, error); + e_error_free (error); + check = gtk_check_button_new_with_mnemonic (string); /* We should hardcode this to true */ gtk_toggle_button_set_active ((GtkToggleButton *)check, TRUE); @@ -184,7 +188,7 @@ action_settings_backup_cb (GtkAction *action, g_free (path); } } else { - e_error_run ( + e_error_run_dialog_for_args ( GTK_WINDOW (shell_window), "org.gnome.backup-restore:insufficient-permissions", NULL); } @@ -220,7 +224,7 @@ action_settings_restore_cb (GtkAction *action, if (mask & BR_OK) restore (path, mask & BR_START); } else { - e_error_run ( + e_error_run_dialog_for_args ( GTK_WINDOW (shell_window), "org.gnome.backup-restore:invalid-backup", NULL); } @@ -327,7 +331,9 @@ backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target) if (state) { if (!file || !sanity_check (file)) { - e_error_run ((GtkWindow *)assistant, "org.gnome.backup-restore:invalid-backup", NULL); + e_error_run_dialog_for_args ((GtkWindow *)assistant, + "org.gnome.backup-restore:invalid-backup", + NULL); } else { restore (file, TRUE); } -- cgit v1.2.3