evolution-data-server r9599 - trunk/camel

[mcrha svn gnome org]

Author: mcrha
Date: Wed Sep 24 14:59:45 2008
New Revision: 9599
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9599&view=rev

Log:
2008-09-24  Milan Crha  <mcrha redhat com>

	** Part of fix for bug #313225

	* camel-folder-summary.c: (summary_build_content_info): Fix
	misunderstanding of the parameter in code causing crash in this part.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-folder-summary.c

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Wed Sep 24 14:59:45 2008
@@ -3557,7 +3557,6 @@
 	CamelMimeFilterCharset *mfc;
 	CamelMessageContentInfo *part;
 	const char *calendar_header;
-	int calendar_header_offset = -1;
 
 	d(printf("building content info\n"));
 
@@ -3580,17 +3579,12 @@
 			)
 			camel_message_info_set_flags(msginfo, CAMEL_MESSAGE_SECURE, CAMEL_MESSAGE_SECURE);
 
-		calendar_header = camel_mime_parser_header (mp, "Content-class", &calendar_header_offset);
-		if (calendar_header) {
-			while (calendar_header [calendar_header_offset] && isspace (calendar_header [calendar_header_offset]))
-				calendar_header_offset++;
-
-			if (g_ascii_strcasecmp (calendar_header + calendar_header_offset, "urn:content-classes:calendarmessage") != 0)
-				calendar_header = NULL;
-		}
+		calendar_header = camel_mime_parser_header (mp, "Content-class", NULL);
+		if (calendar_header && g_ascii_strcasecmp (calendar_header, "urn:content-classes:calendarmessage") != 0)
+			calendar_header = NULL;
 
 		if (!calendar_header)
-			calendar_header = camel_mime_parser_header (mp, "X-Calendar-Attachment", &calendar_header_offset);
+			calendar_header = camel_mime_parser_header (mp, "X-Calendar-Attachment", NULL);
 
 		if (calendar_header)
 			camel_message_info_set_user_flag (msginfo, "$has_cal", TRUE);