2007-08-16 mcrha Part of fix for bug #350539

svn path=/trunk/; revision=34017

6 files changed, 29 insertions, 3 deletions

diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index 98a3dbbc8f..9236ac4af8 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #350539
+
+	* audio-inline.c: (org_gnome_audio_inline_play_clicked):
+	Ensures non-NULL part.
+
 2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
 
 	* audio-inline.c: (org_gnome_audio_inline_add_button):
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index dd9621ce6b..615e06446c 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -214,14 +214,16 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
 		d(printf ("audio inline formatter: init gst thread\n"));
 
 		if (gst_init_check (&argc, (char ***) &argv)) {
-			CamelContentType *type;
+			CamelContentType *type = NULL;
 			GstElement *filesrc;
 
 			/* create a disk reader */
 			filesrc = gst_element_factory_make ("filesrc", "disk_source");
 			g_object_set (G_OBJECT (filesrc), "location", po->filename, NULL);
 
-			type = camel_mime_part_get_content_type (po->part);
+			if (po->part)
+				type = camel_mime_part_get_content_type (po->part);
+
 			if (type) {
 				if (!g_ascii_strcasecmp (type->type, "audio")) {
 					if (!g_ascii_strcasecmp (type->subtype, "mpeg") || !g_ascii_strcasecmp (type->subtype, "x-mpeg")
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 35727aa4b1..c811d9dc7e 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #350539
+
+	* mail-to-task.c: (set_description):
+	Ensures non-NULL mime_part.
+
 2007-04-02  Sankar P  <psankar@novell.com>
 
 	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 9b3d18e7fd..0cddb62bf2 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -131,6 +131,9 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
 		count--;
 	}
 
+	if (!mime_part)
+		return;
+
 	type = camel_mime_part_get_content_type (mime_part);
 	if (!camel_content_type_is (type, "text", "plain"))
 		return;
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index da61ef43d7..3c16d88af2 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-16  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #350539
+
+	* prefer-plain.c: (org_gnome_prefer_plain_multipart_alternative):
+	Ensures non-NULL part.
+
 2007-08-05  Johnny Jacob  <jjohnny@novell.com> 
 
 	* Committed on behalf of Anand V M  <avmuttagi@gmail.com>
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 515645bbad..7d967db839 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -66,7 +66,7 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 	nparts = camel_multipart_get_number(mp);	
 	for (i=0; i<nparts; i++) {
 		part = camel_multipart_get_part(mp, i);
-		if (camel_content_type_is(camel_mime_part_get_content_type(part), "text", "plain")) {
+		if (part && camel_content_type_is(camel_mime_part_get_content_type(part), "text", "plain")) {
 			displayid = i;
 			display_part = part;
 			break;