[evolution-patches] Patch for backporting fix for 272632

["Carsten Guenther" <Carsten Guenther scalix com>]

This is a backport of the patch for 272632, which was fixed in 2.3. I'd
like to get this in 2.2 since this is a critical bug for us and should
there be a 2.2.3 release I want this fix included.

Carsten

? 272632.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/ChangeLog,v
retrieving revision 1.39.2.3
diff -u -p -r1.39.2.3 ChangeLog
--- ChangeLog	7 Apr 2005 17:03:45 -0000	1.39.2.3
+++ ChangeLog	2 Aug 2005 16:59:08 -0000
@@ -1,3 +1,11 @@
+2005-08-02  Carsten Guenther <carsten guenther scalix com>
+
+	Fixes #272632
+
+	* itip-formatter (update_item): skip the "cid:" prefix when
+	calling camel_mime_message_get_part_by_content_id. Also, check
+	part for NULL.
+
 2005-04-07  JP Rosevear  <jpr novell com>
 
 	Fixes #74291
Index: itip-formatter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-formatter.c,v
retrieving revision 1.38.2.2
diff -u -p -r1.38.2.2 itip-formatter.c
--- itip-formatter.c	31 Mar 2005 18:03:29 -0000	1.38.2.2
+++ itip-formatter.c	2 Aug 2005 16:59:08 -0000
@@ -740,9 +740,12 @@ update_item (FormatItipPObject *pitip, I
 				g_slist_free (parts);
 			
 			} else if (!g_ascii_strncasecmp (uri, "cid:", 4)) {
-				part = camel_mime_message_get_part_by_content_id (msg, uri);
-				new_uri = em_utils_temp_save_part (NULL, part);
-				new_attachments = g_slist_append (new_attachments, new_uri);
+                               part = camel_mime_message_get_part_by_content_id (msg, uri + 4);
+                               if (part) {
+                                       new_uri = em_utils_temp_save_part (NULL, part);
+                                       new_attachments = g_slist_append (new_attachments, new_uri);
+                               }
+
 			} else {
 				/* Preserve existing non-cid ones */
 				new_attachments = g_slist_append (new_attachments, g_strdup (uri));