[Commits] [SCM] claws branch, master, updated. 3.9.3-172-g3ee9de9

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  3ee9de9029f44ea808975fd049805690f7613529 (commit)
      from  cc0a3a5cb8d80d0d339a149bf956a72b85251e97 (commit)


- Log -----------------------------------------------------------------
commit 3ee9de9029f44ea808975fd049805690f7613529
Author: Colin Leroy <colin at colino.net>
Date:   Mon May 5 17:24:09 2014 +0200

    revert erroneous 2b0b467727d110b8505517bd92261608e499f57f; we need
    this differenciation to show attachments

diff --git a/src/textview.c b/src/textview.c
index 2d027c2..9131f91 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -636,7 +636,15 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 
 	textview_clear(textview);
 
-	textview_add_parts(textview, mimeinfo);
+	if (mimeinfo->type == MIMETYPE_MULTIPART ||
+	    (mimeinfo->type == MIMETYPE_MESSAGE && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
+		textview_add_parts(textview, mimeinfo);
+	} else {
+		if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
+			perror("fseek");
+
+		textview_write_body(textview, mimeinfo);
+	}
 
 	textview->loading = FALSE;
 	textview->stop_loading = FALSE;
@@ -797,7 +805,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 			END_TIMING();
 			GTK_EVENTS_FLUSH();
 		}
-	} else {
+	} else if (mimeinfo->type == MIMETYPE_TEXT) {
 		if (prefs_common.display_header && (charcount > 0))
 			gtk_text_buffer_insert(buffer, &iter, "\n", 1);
 

-----------------------------------------------------------------------

Summary of changes:
 src/textview.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail