From ac1f847f7b40b3a0f6ed00dedd2eb2b0f23b5027 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Tue, 24 Nov 2009 17:19:32 -0600 Subject: port composer/ to user new EError API https://bugzilla.gnome.org/show_bug.cgi?id=602963 --- composer/e-msg-composer.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index c580a22305..77a7014c47 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -174,6 +174,7 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, c va_list ap; gint button; GConfClient *gconf = gconf_client_get_default (); + EError *error = NULL; if (promptkey && !gconf_client_get_bool(gconf, promptkey, NULL)) { @@ -182,9 +183,12 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, c } 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); + if (promptkey) { check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); gtk_container_set_border_width((GtkContainer *)check, 12); @@ -1081,7 +1085,7 @@ skip_content: camel_object_unref (new); if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { - e_error_run ((GtkWindow *)composer, "mail-composer:no-build-message", + e_error_run_dialog_for_args ((GtkWindow *)composer, "mail-composer:no-build-message", camel_exception_get_description (&ex), NULL); } @@ -1373,7 +1377,7 @@ autosave_load_draft_cb (EMsgComposer *composer, g_unlink (filename); else { - e_error_run ( + e_error_run_dialog_for_args ( GTK_WINDOW (composer), "mail-composer:no-autosave", (filename != NULL) ? filename : "", @@ -4016,7 +4020,7 @@ e_msg_composer_check_autosave (GtkWindow *parent) } /* Ask if the user wants to recover the orphaned files. */ - response = e_error_run ( + response = e_error_run_dialog_for_args ( parent, "mail-composer:recover-autosave", NULL); /* Based on the user's response, recover or delete them. */ -- cgit