From cb1ed78274167e56c19989b6e1b5b818d3f022c4 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Sat, 25 Oct 2003 19:25:10 +0000
Subject: [PATCH] 0.9.6claws52

* src/procmime.c
        fix message body searching
---
 ChangeLog.claws |  5 +++++
 configure.ac    |  2 +-
 src/procmime.c  | 34 ++++++++++------------------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9fcdc32d4..4e8e5bd80 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-10-25 [christoph]	0.9.6claws52
+
+	* src/procmime.c
+		fix message body searching
+
 2003-10-25 [paul]	0.9.6claws51
 
 	* src/compose.c
diff --git a/configure.ac b/configure.ac
index d5d53acac..13b8c8817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=51
+EXTRA_VERSION=52
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/procmime.c b/src/procmime.c
index bcc227492..7a22ac805 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -167,15 +167,19 @@ MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
 
 MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
 {
-	if (!mimeinfo) return NULL;
+	g_return_val_if_fail(mimeinfo != NULL, NULL);
+	g_return_val_if_fail(mimeinfo->node != NULL, NULL);
 
 	if (mimeinfo->node->children)
 		return (MimeInfo *) mimeinfo->node->children->data;
 	if (mimeinfo->node->next)
 		return (MimeInfo *) mimeinfo->node->next->data;
 
-	for (mimeinfo = (MimeInfo *) mimeinfo->node->parent->data; mimeinfo != NULL;
-	     mimeinfo = (MimeInfo *) mimeinfo->node->parent->data) {
+	if (mimeinfo->node->parent == NULL)
+		return NULL;
+
+	while (mimeinfo->node->parent != NULL) {
+		mimeinfo = (MimeInfo *) mimeinfo->node->parent->data;
 		if (mimeinfo->node->next)
 			return (MimeInfo *) mimeinfo->node->next->data;
 	}
@@ -597,26 +601,15 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
 gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
 				   const gchar *str, gboolean case_sens)
 {
-	return FALSE;
-
-#if 0	/* FIXME */
 	FILE *infp, *outfp;
 	gchar buf[BUFFSIZE];
 	gchar *(* StrFindFunc) (const gchar *haystack, const gchar *needle);
 
 	g_return_val_if_fail(mimeinfo != NULL, FALSE);
-	g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||
-			     mimeinfo->mime_type == MIME_TEXT_HTML ||
-			     mimeinfo->mime_type == MIME_TEXT_ENRICHED, FALSE);
+	g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
 	g_return_val_if_fail(str != NULL, FALSE);
 
-	if ((infp = fopen(filename, "rb")) == NULL) {
-		FILE_OP_ERROR(filename, "fopen");
-		return FALSE;
-	}
-
-	outfp = procmime_get_text_content(mimeinfo, infp);
-	fclose(infp);
+	outfp = procmime_get_text_content(mimeinfo);
 
 	if (!outfp)
 		return FALSE;
@@ -636,15 +629,11 @@ gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
 	fclose(outfp);
 
 	return FALSE;
-#endif
 }
 
 gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
 			      gboolean case_sens)
 {
-	return FALSE;
-
-#if 0	/* FIXME */
 	MimeInfo *mimeinfo;
 	MimeInfo *partinfo;
 	gchar *filename;
@@ -659,9 +648,7 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
 
 	for (partinfo = mimeinfo; partinfo != NULL;
 	     partinfo = procmime_mimeinfo_next(partinfo)) {
-		if (partinfo->mime_type == MIME_TEXT ||
-		    partinfo->mime_type == MIME_TEXT_HTML ||
-		    partinfo->mime_type == MIME_TEXT_ENRICHED) {
+		if (partinfo->type == MIMETYPE_TEXT) {
 			if (procmime_find_string_part
 				(partinfo, filename, str, case_sens) == TRUE) {
 				found = TRUE;
@@ -674,7 +661,6 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
 	g_free(filename);
 
 	return found;
-#endif
 }
 
 gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
-- 
2.25.1