[balsa/gmime3: 17/54] Add parser-options argument
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gmime3: 17/54] Add parser-options argument
- Date: Fri, 17 Apr 2020 14:54:55 +0000 (UTC)
commit 42a6e7bc3500274c15df902eadce309cf645f115
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Thu Nov 21 10:02:42 2019 -0800
Add parser-options argument
to calls to g_mime_parser_construct_part().
modified: libbalsa/gmime-application-pkcs7.c
modified: libbalsa/gmime-multipart-crypt.c
modified: libbalsa/mailbox_imap.c
libbalsa/gmime-application-pkcs7.c | 14 +++-----------
libbalsa/gmime-multipart-crypt.c | 4 ++--
libbalsa/mailbox_imap.c | 2 +-
3 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
index 6fba12cd1..e263980cc 100644
--- a/libbalsa/gmime-application-pkcs7.c
+++ b/libbalsa/gmime-application-pkcs7.c
@@ -23,19 +23,11 @@
#include <string.h>
-#include <gmime/gmime-stream-filter.h>
-#include <gmime/gmime-filter-crlf.h>
-#include <gmime/gmime-filter-from.h>
-#include <gmime/gmime-filter-basic.h>
-#include <gmime/gmime-stream-mem.h>
-#include <gmime/gmime-parser.h>
-#include <gmime/gmime-message-part.h>
-#include <gmime/gmime-multipart.h>
-#include <gmime/gmime-multipart-signed.h>
-#include <gmime/gmime-multipart-encrypted.h>
+#include <gmime/gmime.h>
#include "libbalsa-gpgme.h"
#include "gmime-application-pkcs7.h"
#include <glib/gi18n.h>
+#include "misc.h"
#ifdef G_LOG_DOMAIN
@@ -119,7 +111,7 @@ g_mime_application_pkcs7_decrypt_verify(GMimePart * pkcs7,
g_mime_parser_init_with_stream(parser, stream);
g_object_unref(stream);
- decrypted = g_mime_parser_construct_part(parser);
+ decrypted = g_mime_parser_construct_part(parser, libbalsa_parser_options());
g_object_unref(parser);
if (decrypted)
diff --git a/libbalsa/gmime-multipart-crypt.c b/libbalsa/gmime-multipart-crypt.c
index 6401aca44..b65833b0d 100644
--- a/libbalsa/gmime-multipart-crypt.c
+++ b/libbalsa/gmime-multipart-crypt.c
@@ -172,7 +172,7 @@ g_mime_gpgme_mps_sign(GMimeMultipartSigned * mps, GMimeObject * content,
/* construct the content part */
parser = g_mime_parser_new_with_stream(stream);
- content = g_mime_parser_construct_part(parser);
+ content = g_mime_parser_construct_part(parser, libbalsa_parser_options());
g_object_unref(stream);
g_object_unref(parser);
@@ -523,7 +523,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
g_mime_parser_init_with_stream(parser, stream);
g_object_unref(stream);
- decrypted = g_mime_parser_construct_part(parser);
+ decrypted = g_mime_parser_construct_part(parser, libbalsa_parser_options());
g_object_unref(parser);
if (!decrypted) {
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index 83a8d0dc1..0f83cc9a5 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -2543,7 +2543,7 @@ lbm_imap_get_msg_part_from_cache(LibBalsaMessage * message,
{
GMimeParser *parser =
g_mime_parser_new_with_stream (partstream);
- part->mime_part = g_mime_parser_construct_part (parser);
+ part->mime_part = g_mime_parser_construct_part (parser, libbalsa_parser_options());
g_object_unref (parser);
}
g_object_unref (partstream);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]