diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 3 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 4 | ||||
| -rw-r--r-- | mail/em-format.c | 1 |
4 files changed, 15 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index c7006a72ea..55d16fc302 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,14 @@ 2008-01-24 Milan Crha <mcrha@redhat.com> + ** Partial fix for bug #395939 + + * em-format.c: (emf_inlinepgp_signed): + * em-format-html-display.c: (efhd_format_optional): + * em-folder-view.c: (emfv_destroy): + Memory leak fix. + +2008-01-24 Milan Crha <mcrha@redhat.com> + ** Fix for bug #402487 * em-folder-browser.c: (emfb_search_search_activated), diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 6fdafc0dcf..91a9f3dc82 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -390,6 +390,9 @@ emfv_destroy (GtkObject *o) g_free(p->selected_uid); p->selected_uid = NULL; + g_free (emfv->displayed_uid); + emfv->displayed_uid = NULL; + emfv->preview = NULL; emfv->list = NULL; emfv->preview_active = FALSE; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 6e0b0e759d..fa0c4fe620 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -2618,9 +2618,9 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C classid = g_strdup_printf("optional%s", emf->part_id->str); info = (struct _attach_puri *)em_format_add_puri(emf, sizeof(*info), classid, part, efhd_attachment_frame); em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_attachment_optional); - info->handle = em_format_find_handler(emf, "text/plain");; + info->handle = em_format_find_handler(emf, "text/plain"); info->shown = FALSE; - info->snoop_mime_type = g_strdup("text/plain"); + info->snoop_mime_type = "text/plain"; info->attachment = e_attachment_new_from_mime_part (info->puri.part); info->mstream = (CamelStreamMem *)mstream; if (emf->valid) { diff --git a/mail/em-format.c b/mail/em-format.c index 36177d7991..275211c2eb 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1625,6 +1625,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E dw = camel_data_wrapper_new (); camel_data_wrapper_construct_from_stream (dw, ostream); camel_data_wrapper_set_mime_type (dw, type); + g_free (type); opart = camel_mime_part_new (); camel_medium_set_content_object ((CamelMedium *) opart, dw); |