gmime r1428 - in trunk: . gmime

[fejj svn gnome org]

Author: fejj
Date: Sat Sep  6 15:05:35 2008
New Revision: 1428
URL: http://svn.gnome.org/viewvc/gmime?rev=1428&view=rev

Log:
2008-09-06  Jeffrey Stedfast  <fejj novell com>

	* gmime/gmime-multipart.c (g_mime_multipart_get_subpart_from_content_id):
	Multiparts can have Content-Id's too.



Modified:
   trunk/ChangeLog
   trunk/gmime/gmime-multipart.c

Modified: trunk/gmime/gmime-multipart.c
==============================================================================
--- trunk/gmime/gmime-multipart.c	(original)
+++ trunk/gmime/gmime-multipart.c	Sat Sep  6 15:05:35 2008
@@ -845,7 +845,7 @@
  * Gets the mime part with the content-id @content_id from the
  * multipart @multipart.
  *
- * Returns: the GMimeObject whose content-id matches the search string,
+ * Returns: the #GMimeObject whose content-id matches the search string,
  * or %NULL if a match cannot be found.
  **/
 GMimeObject *
@@ -865,12 +865,13 @@
 	for (i = 0; i < multipart->children->len; i++) {
 		subpart = multipart->children->pdata[i];
 		
+		if (subpart->content_id && !strcmp (subpart->content_id, content_id))
+			return subpart;
+		
 		if (GMIME_IS_MULTIPART (subpart)) {
 			mpart = (GMimeMultipart *) subpart;
 			if ((part = g_mime_multipart_get_subpart_from_content_id (mpart, content_id)))
 				return part;
-		} else if (subpart->content_id && !strcmp (subpart->content_id, content_id)) {
-			return subpart;
 		}
 	}