[gmime] Fixed the build



commit d3a3e9b1800f2d9a6903a3093ee03464d7448bb3
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Thu Dec 14 12:37:22 2017 -0500

    Fixed the build

 gmime/gmime-parser.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gmime/gmime-parser.c b/gmime/gmime-parser.c
index e4a079b..f38dcd7 100644
--- a/gmime/gmime-parser.c
+++ b/gmime/gmime-parser.c
@@ -1560,6 +1560,7 @@ static void
 parser_scan_mime_part_content (GMimeParser *parser, GMimePart *mime_part, BoundaryType *found)
 {
        struct _GMimeParserPrivate *priv = parser->priv;
+       GMimeContentType *content_type;
        GMimeContentEncoding encoding;
        GMimeDataWrapper *content;
        GMimeStream *stream;
@@ -1597,6 +1598,8 @@ parser_scan_mime_part_content (GMimeParser *parser, GMimePart *mime_part, Bounda
        g_mime_part_set_content (mime_part, content);
        g_object_unref (content);
        
+       content_type = g_mime_object_get_content_type ((GMimeObject *) mime_part);
+       
        switch (priv->openpgp) {
        case GMIME_OPENPGP_END_PGP_SIGNATURE:
                g_mime_part_set_openpgp_data (mime_part, GMIME_OPENPGP_DATA_SIGNED);
@@ -1611,12 +1614,11 @@ parser_scan_mime_part_content (GMimeParser *parser, GMimePart *mime_part, Bounda
                g_mime_part_set_openpgp_data (mime_part, GMIME_OPENPGP_DATA_PRIVATE_KEY);
                break;
        default:
-               if (mime_part->encoding != GMIME_CONTENT_ENCODING_BASE64 &&
-                   mime_part->encoding != GMIME_CONTENT_ENCODING_UUENCODE) {
+               if (encoding != GMIME_CONTENT_ENCODING_BASE64 && encoding != GMIME_CONTENT_ENCODING_UUENCODE) 
{
                        /* If the Content-Transfer-Encoding is not obfuscated by base64 or uuencode,
                           then we can safely assume that no OpenPGP blocks exist. */
                        g_mime_part_set_openpgp_data (mime_part, GMIME_OPENPGP_DATA_NONE);
-               } else if (!g_mime_content_type_is_type (mime_part->content_type, "text", "*")) {
+               } else if (!g_mime_content_type_is_type (content_type, "text", "*")) {
                        /* The content is base64 or uuencoded, but it's not text so it should be safe
                           to assume that there won't be any OpenPGP blocks in the decoded content. */
                        g_mime_part_set_openpgp_data (mime_part, GMIME_OPENPGP_DATA_NONE);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]