aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/e-composer-actions.c8
-rw-r--r--composer/e-composer-autosave.c2
-rw-r--r--composer/e-msg-composer.c12
3 files changed, 13 insertions, 9 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 851b0f3e53..f7ea281f78 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -78,7 +78,7 @@ action_close_cb (GtkAction *action,
if (subject == NULL || *subject == '\0')
subject = _("Untitled Message");
- response = e_error_run (
+ response = e_error_run_dialog_for_args (
GTK_WINDOW (composer),
"mail-composer:exit-unsaved",
subject, NULL);
@@ -162,14 +162,14 @@ action_save_cb (GtkAction *action,
if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
gint response;
- response = e_error_run (
+ response = e_error_run_dialog_for_args (
GTK_WINDOW (composer),
E_ERROR_ASK_FILE_EXISTS_OVERWRITE,
filename, NULL);
if (response != GTK_RESPONSE_OK)
return;
} else {
- e_error_run (
+ e_error_run_dialog_for_args (
GTK_WINDOW (composer),
E_ERROR_NO_SAVE_FILE, filename,
g_strerror (errno_saved), NULL);
@@ -179,7 +179,7 @@ action_save_cb (GtkAction *action,
close (fd);
if (!gtkhtml_editor_save (editor, filename, TRUE, &error)) {
- e_error_run (
+ e_error_run_dialog_for_args (
GTK_WINDOW (composer),
E_ERROR_NO_SAVE_FILE,
filename, error->message, NULL);
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index b0bc659143..5a9c95705b 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -123,7 +123,7 @@ composer_autosave_finish_cb (EMsgComposer *composer,
e_composer_autosave_snapshot_finish (composer, result, &error);
if (error != NULL) {
- e_error_run (
+ e_error_run_dialog_for_args (
GTK_WINDOW (composer),
"mail-composer:no-autosave",
"", error->message, NULL);
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. */