From e9292600bd46c769bebe82862bce447d65ba558c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 2 May 2014 11:57:33 +0200 Subject: [PATCH] Factorize to make clearer --- src/textview.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/src/textview.c b/src/textview.c index 37456dfb6..d10485ddb 100644 --- a/src/textview.c +++ b/src/textview.c @@ -631,38 +631,28 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp) cm_return_if_fail(mimeinfo != NULL); cm_return_if_fail(fp != NULL); - if ((mimeinfo->type == MIMETYPE_MULTIPART) || - ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) { - textview->loading = TRUE; - textview->stop_loading = FALSE; - - textview_clear(textview); - textview_add_parts(textview, mimeinfo); - - textview->loading = FALSE; - textview->stop_loading = FALSE; - textview_set_position(textview, 0); - - END_TIMING(); - return; - } textview->loading = TRUE; textview->stop_loading = FALSE; - if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) - perror("fseek"); - textview_clear(textview); - if (mimeinfo->type == MIMETYPE_MULTIPART) + if ((mimeinfo->type == MIMETYPE_MULTIPART) || + ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) { textview_add_parts(textview, mimeinfo); - else - textview_write_body(textview, mimeinfo); + } else { + if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) + perror("fseek"); + + if (mimeinfo->type == MIMETYPE_MULTIPART) + textview_add_parts(textview, mimeinfo); + else + textview_write_body(textview, mimeinfo); + } textview->loading = FALSE; textview->stop_loading = FALSE; - textview_set_position(textview, 0); + END_TIMING(); } -- 2.25.1