aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog12
-rw-r--r--mail/mail-callbacks.c4
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 35b2b33d45..3bf9738592 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-20 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Oops,
+ don't free memory that we don't own.
+
2001-09-20 Dan Winship <danw@ximian.com>
* mail-config.c (evolution_mail_config_factory_init): No need to
@@ -9,8 +14,8 @@
* mail-callbacks.c (mail_generate_reply): Truncate extremely long
subjects. (inspired by bug #9158)
- * mail-tools.c (mail_tool_generate_forward_subject): Truncate extremely long
- subjects. (bug #9158)
+ * mail-tools.c (mail_tool_generate_forward_subject): Truncate
+ extremely long subjects. (bug #9158)
2001-09-19 Jeffrey Stedfast <fejj@ximian.com>
@@ -22,7 +27,8 @@
2001-09-12 Iain Holmes <iain@ximian.com>
- * importers/evolution-mbox-importer.c (load_file_fn): Fix memory leak.
+ * importers/evolution-mbox-importer.c (load_file_fn): Fix memory
+ leak.
2001-09-19 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 7efd2523b1..e7cf846fa9 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -217,11 +217,11 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip
"do not want HTML-formatted mail:\n"));
for (i = 0; recipients[i] != NULL; ++i) {
if (!e_destination_get_html_mail_pref (recipients[i])) {
- char *buf, *name;
+ const char *name;
+ char *buf;
name = e_destination_get_textrep (recipients[i]);
buf = e_utf8_to_locale_string (name);
- g_free (name);
g_string_sprintfa (str, " %s\n", buf);
g_free (buf);