[balsa/gmime3: 9/49] More GMime3 changes

[Peter Bloomfield <peterb src gnome org>]

commit 9c7cc7680470c9d27e7f5f0ad711da9dd7a57fdc
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Nov 20 19:44:31 2019 -0800

    More GMime3 changes
    
    g_mime_part_get_content_object() renamed to g_mime_part_get_content();
    g_mime_object_write_to_stream() now has a format-options argument, which
    we always pass as NULL.

 libbalsa/body.c                    |  6 +++---
 libbalsa/gmime-application-pkcs7.c |  4 ++--
 libbalsa/gmime-multipart-crypt.c   | 10 +++++-----
 libbalsa/gmime-part-rfc2440.c      |  8 ++++----
 libbalsa/message.c                 |  2 +-
 libbalsa/send.c                    |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/libbalsa/body.c b/libbalsa/body.c
index e3689be5a..1bf614c1e 100644
--- a/libbalsa/body.c
+++ b/libbalsa/body.c
@@ -482,7 +482,7 @@ libbalsa_message_body_get_part_stream(LibBalsaMessageBody * body,
     gchar *mime_type = NULL;
     const gchar *charset;
 
-    wrapper = g_mime_part_get_content_object(GMIME_PART(body->mime_part));
+    wrapper = g_mime_part_get_content(GMIME_PART(body->mime_part));
     if (!wrapper) {
         /* part is incomplete. */
         g_set_error(err, LIBBALSA_MAILBOX_ERROR,
@@ -562,7 +562,7 @@ libbalsa_message_body_get_message_part_stream(LibBalsaMessageBody * body,
     mailbox = libbalsa_message_get_mailbox(body->message);
     libbalsa_mailbox_lock_store(mailbox);
     bytes_written =
-        g_mime_object_write_to_stream(GMIME_OBJECT(msg), stream);
+        g_mime_object_write_to_stream(GMIME_OBJECT(msg), NULL, stream);
     libbalsa_mailbox_unlock_store(mailbox);
     printf("Written %ld bytes of embedded message\n",
            (long) bytes_written);
@@ -755,7 +755,7 @@ libbalsa_message_body_save_stream(LibBalsaMessageBody * body,
         g_object_unref(stream);
     } else
         /* body->mime_part is neither a GMimePart nor a GMimeMessagePart. */
-        len = g_mime_object_write_to_stream(body->mime_part, dest);
+        len = g_mime_object_write_to_stream(body->mime_part, NULL, dest);
 
     libbalsa_mailbox_unlock_store(mailbox);
     g_object_unref(dest);
diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
index fdc24de5d..df05bf407 100644
--- a/libbalsa/gmime-application-pkcs7.c
+++ b/libbalsa/gmime-application-pkcs7.c
@@ -80,7 +80,7 @@ g_mime_application_pkcs7_decrypt_verify(GMimePart * pkcs7,
     }
 
     /* get the ciphertext stream */
-    wrapper = g_mime_part_get_content_object(GMIME_PART(pkcs7));
+    wrapper = g_mime_part_get_content(GMIME_PART(pkcs7));
     g_return_val_if_fail(wrapper, NULL); /* Incomplete part. */
     ciphertext = g_mime_stream_mem_new();
     g_mime_data_wrapper_write_to_stream(wrapper, ciphertext);
@@ -161,7 +161,7 @@ g_mime_application_pkcs7_encrypt(GMimePart * pkcs7, GMimeObject * content,
                             crlf_filter);
     g_object_unref(crlf_filter);
        
-    g_mime_object_write_to_stream(content, filtered_stream);
+    g_mime_object_write_to_stream(content, NULL, filtered_stream);
     g_mime_stream_flush(filtered_stream);
     g_object_unref(filtered_stream);
        
diff --git a/libbalsa/gmime-multipart-crypt.c b/libbalsa/gmime-multipart-crypt.c
index 3db0e3d2a..9ec2d95ec 100644
--- a/libbalsa/gmime-multipart-crypt.c
+++ b/libbalsa/gmime-multipart-crypt.c
@@ -125,7 +125,7 @@ g_mime_gpgme_mps_sign(GMimeMultipartSigned * mps, GMimeObject * content,
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered), filter);
     g_object_unref(filter);
 
-    g_mime_object_write_to_stream(content, filtered);
+    g_mime_object_write_to_stream(content, NULL, filtered);
     g_mime_stream_flush(filtered);
     g_object_unref(filtered);
     g_mime_stream_reset(stream);
@@ -282,13 +282,13 @@ g_mime_gpgme_mps_verify(GMimeMultipartSigned * mps, GError ** error)
                             crlf_filter);
     g_object_unref(crlf_filter);
 
-    g_mime_object_write_to_stream(content, filtered_stream);
+    g_mime_object_write_to_stream(content, NULL, filtered_stream);
     g_mime_stream_flush(filtered_stream);
     g_object_unref(filtered_stream);
     g_mime_stream_reset(stream);
 
     /* get the signature stream */
-    wrapper = g_mime_part_get_content_object(GMIME_PART(signature));
+    wrapper = g_mime_part_get_content(GMIME_PART(signature));
 
     /* a s/mime signature is always encoded, a pgp signature shouldn't,
      * but there exist implementations which encode it... */
@@ -333,7 +333,7 @@ g_mime_gpgme_mpe_encrypt(GMimeMultipartEncrypted * mpe,
                             crlf_filter);
     g_object_unref(crlf_filter);
 
-    g_mime_object_write_to_stream(content, filtered_stream);
+    g_mime_object_write_to_stream(content, NULL, filtered_stream);
     g_mime_stream_flush(filtered_stream);
     g_object_unref(filtered_stream);
 
@@ -492,7 +492,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
     }
 
     /* get the ciphertext stream */
-    wrapper = g_mime_part_get_content_object(GMIME_PART(encrypted));
+    wrapper = g_mime_part_get_content(GMIME_PART(encrypted));
     ciphertext = g_mime_data_wrapper_get_decoded_stream(wrapper);
     g_mime_stream_reset(ciphertext);
 
diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
index 85bad0c7c..b43359a7d 100644
--- a/libbalsa/gmime-part-rfc2440.c
+++ b/libbalsa/gmime-part-rfc2440.c
@@ -63,7 +63,7 @@ g_mime_part_check_rfc2440(GMimePart * part)
     static const char end_pgp_signature[]        = "-----END PGP SIGNATURE-----";
 
     /* try to get the content stream */
-    wrapper = g_mime_part_get_content_object(part);
+    wrapper = g_mime_part_get_content(part);
     g_return_val_if_fail(wrapper, GMIME_PART_RFC2440_NONE);
 
     stream = g_mime_data_wrapper_get_stream(wrapper);
@@ -147,7 +147,7 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, const char *sign_userid,
     g_return_val_if_fail(recipients != NULL || sign_userid != NULL, FALSE);
 
     /* get the raw content */
-    wrapper = g_mime_part_get_content_object(part);
+    wrapper = g_mime_part_get_content(part);
     g_return_val_if_fail(wrapper, FALSE); /* Incomplete part. */
     stream = g_mime_data_wrapper_get_stream(wrapper);
     g_mime_stream_reset(stream);
@@ -252,7 +252,7 @@ g_mime_part_rfc2440_verify(GMimePart * part, GError ** err)
     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
 
     /* get the raw content */
-    wrapper = g_mime_part_get_content_object(GMIME_PART(part));
+    wrapper = g_mime_part_get_content(GMIME_PART(part));
     g_return_val_if_fail(wrapper, NULL); /* Incomplete part. */
     stream = g_mime_stream_mem_new();
     g_mime_data_wrapper_write_to_stream(wrapper, stream);
@@ -307,7 +307,7 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, GtkWindow * parent,
     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
 
     /* get the raw content */
-    wrapper = g_mime_part_get_content_object(part);
+    wrapper = g_mime_part_get_content(part);
     g_return_val_if_fail(wrapper, NULL); /* Incomplete part. */
     stream = g_mime_stream_mem_new();
     g_mime_data_wrapper_write_to_stream(wrapper, stream);
diff --git a/libbalsa/message.c b/libbalsa/message.c
index 99e967336..811e41356 100644
--- a/libbalsa/message.c
+++ b/libbalsa/message.c
@@ -1418,7 +1418,7 @@ libbalsa_message_stream(LibBalsaMessage *message)
 
 
     mime_stream = g_mime_stream_mem_new();
-    g_mime_object_write_to_stream(GMIME_OBJECT(message->mime_msg),
+    g_mime_object_write_to_stream(GMIME_OBJECT(message->mime_msg), NULL,
                                   mime_stream);
     g_mime_stream_reset(mime_stream);
 
diff --git a/libbalsa/send.c b/libbalsa/send.c
index d57d9492e..c84b63c44 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1724,7 +1724,7 @@ libbalsa_fill_msg_queue_item_from_queu(LibBalsaMessage  *message,
 
         msg_stream = g_mime_stream_mem_new();
         libbalsa_mailbox_lock_store(mailbox);
-        g_mime_object_write_to_stream(GMIME_OBJECT(libbalsa_message_get_mime_message(message)), msg_stream);
+        g_mime_object_write_to_stream(GMIME_OBJECT(libbalsa_message_get_mime_message(message)), NULL, 
msg_stream);
         libbalsa_mailbox_unlock_store(mailbox);
         g_mime_stream_reset(msg_stream);
     } else {