aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-ops.c10
2 files changed, 5 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1838a14774..316a2def67 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-10-17 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-ops.c (mail_send_message): No longer need to copy the
+ description now that camel-exceptions have been fixed.
+
* subscribe-dialog.h (subscribe_dialog_show): Helper macro.
* subscribe-dialog.c (subscribe_dialog_run_and_close): Removed.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index e0d9836987..e0780d1da3 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -484,14 +484,11 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte
NULL, NULL, NULL, "", ex);
if (camel_exception_is_set (ex)) {
- char *description;
ExceptionId id;
id = camel_exception_get_id (ex);
- description = g_strdup (camel_exception_get_description (ex));
- camel_exception_setv (ex, id, "%s\n%s", description,
+ camel_exception_setv (ex, id, "%s\n%s", camel_exception_get_description (ex),
_("However, the message was successfully sent."));
- g_free (description);
camel_message_info_free (info);
g_free (sent_folder_uri);
@@ -516,14 +513,11 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte
if (folder) {
camel_folder_append_message (folder, message, info, ex);
if (camel_exception_is_set (ex)) {
- char *description;
ExceptionId id;
id = camel_exception_get_id (ex);
- description = g_strdup (camel_exception_get_description (ex));
- camel_exception_setv (ex, id, "%s\n%s", description,
+ camel_exception_setv (ex, id, "%s\n%s", camel_exception_get_description (ex),
_("However, the message was successfully sent."));
- g_free (description);
}
camel_folder_sync (folder, FALSE, NULL);