evolution r34881 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Thu Jan 24 11:44:00 2008
New Revision: 34881
URL: http://svn.gnome.org/viewvc/evolution?rev=34881&view=rev

Log:
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.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-view.c
   trunk/mail/em-format-html-display.c
   trunk/mail/em-format.c

Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c	(original)
+++ trunk/mail/em-folder-view.c	Thu Jan 24 11:44:00 2008
@@ -390,6 +390,9 @@
 	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;

Modified: trunk/mail/em-format-html-display.c
==============================================================================
--- trunk/mail/em-format-html-display.c	(original)
+++ trunk/mail/em-format-html-display.c	Thu Jan 24 11:44:00 2008
@@ -2618,9 +2618,9 @@
 	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) {

Modified: trunk/mail/em-format.c
==============================================================================
--- trunk/mail/em-format.c	(original)
+++ trunk/mail/em-format.c	Thu Jan 24 11:44:00 2008
@@ -1625,6 +1625,7 @@
 	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);