[balsa/gmime3: 14/53] g_mime_filter_crlf_new() is no more

[Peter Bloomfield <peterb src gnome org>]

commit d672159b675876c6f8a66ecc49cf014e78a7da56
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Nov 20 20:10:12 2019 -0800

    g_mime_filter_crlf_new() is no more
    
    Partial patch

 libbalsa/body.c                    | 3 ++-
 libbalsa/gmime-application-pkcs7.c | 4 ++--
 libbalsa/gmime-multipart-crypt.c   | 8 ++++----
 libbalsa/gmime-part-rfc2440.c      | 2 +-
 libbalsa/mailbox_imap.c            | 4 +---
 5 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/libbalsa/body.c b/libbalsa/body.c
index 1bf614c1e..ad9e9ddc6 100644
--- a/libbalsa/body.c
+++ b/libbalsa/body.c
@@ -746,7 +746,8 @@ libbalsa_message_body_save_stream(LibBalsaMessageBody * body,
         g_mime_stream_reset(stream);
 
         if (filter_crlf) {
-            GMimeFilter *filter = g_mime_filter_crlf_new(FALSE, FALSE);
+            GMimeFilter *filter = g_mime_filter_dos2unix_new(FALSE);
+
             stream =
                 libbalsa_message_body_stream_add_filter(stream, filter);
         }
diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
index df05bf407..4831eeb95 100644
--- a/libbalsa/gmime-application-pkcs7.c
+++ b/libbalsa/gmime-application-pkcs7.c
@@ -88,7 +88,7 @@ g_mime_application_pkcs7_decrypt_verify(GMimePart * pkcs7,
 
     stream = g_mime_stream_mem_new();
     filtered_stream = g_mime_stream_filter_new(stream);
-    crlf_filter = g_mime_filter_crlf_new(FALSE, FALSE);
+    crlf_filter = g_mime_filter_dos2unix_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream),
                             crlf_filter);
     g_object_unref(crlf_filter);
@@ -156,7 +156,7 @@ g_mime_application_pkcs7_encrypt(GMimePart * pkcs7, GMimeObject * content,
     stream = g_mime_stream_mem_new();
     filtered_stream = g_mime_stream_filter_new(stream);
        
-    crlf_filter = g_mime_filter_crlf_new(TRUE, FALSE);
+    crlf_filter = g_mime_filter_unix2dos_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream),
                             crlf_filter);
     g_object_unref(crlf_filter);
diff --git a/libbalsa/gmime-multipart-crypt.c b/libbalsa/gmime-multipart-crypt.c
index 9ec2d95ec..19581cfa5 100644
--- a/libbalsa/gmime-multipart-crypt.c
+++ b/libbalsa/gmime-multipart-crypt.c
@@ -132,7 +132,7 @@ g_mime_gpgme_mps_sign(GMimeMultipartSigned * mps, GMimeObject * content,
 
     /* Note: see rfc2015 or rfc3156, section 5.1 */
     filtered = g_mime_stream_filter_new(stream);
-    filter = g_mime_filter_crlf_new(TRUE, FALSE);
+    filter = g_mime_filter_unix2dos_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered), filter);
     g_object_unref(filter);
 
@@ -277,7 +277,7 @@ g_mime_gpgme_mps_verify(GMimeMultipartSigned * mps, GError ** error)
     filtered_stream = g_mime_stream_filter_new(stream);
 
     /* Note: see rfc2015 or rfc3156, section 5.1 */
-    crlf_filter = g_mime_filter_crlf_new(TRUE, FALSE);
+    crlf_filter = g_mime_filter_unix2dos_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream),
                             crlf_filter);
     g_object_unref(crlf_filter);
@@ -328,7 +328,7 @@ g_mime_gpgme_mpe_encrypt(GMimeMultipartEncrypted * mpe,
     stream = g_mime_stream_mem_new();
     filtered_stream = g_mime_stream_filter_new(stream);
 
-    crlf_filter = g_mime_filter_crlf_new(TRUE, FALSE);
+    crlf_filter = g_mime_filter_unix2dos_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream),
                             crlf_filter);
     g_object_unref(crlf_filter);
@@ -498,7 +498,7 @@ g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
 
     stream = g_mime_stream_mem_new();
     filtered_stream = g_mime_stream_filter_new(stream);
-    crlf_filter = g_mime_filter_crlf_new(FALSE, FALSE);
+    crlf_filter = g_mime_filter_dos2unix_new(FALSE);
     g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream),
                             crlf_filter);
     g_object_unref(crlf_filter);
diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
index b43359a7d..4351e19df 100644
--- a/libbalsa/gmime-part-rfc2440.c
+++ b/libbalsa/gmime-part-rfc2440.c
@@ -331,7 +331,7 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, GtkWindow * parent,
 
        /* strip crlf off encrypted stuff coming from Winbloze crap */
        filter_stream = g_mime_stream_filter_new(plainstream);
-       filter = g_mime_filter_crlf_new(FALSE, FALSE);
+       filter = g_mime_filter_dos2unix_new(FALSE);
        g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream),
                                 filter);
        g_object_unref(filter);
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index de7ad47d1..9ec282b4c 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -2848,9 +2848,7 @@ multi_append_cb(char * buf, size_t buflen,
 
        tmpstream = g_mime_stream_filter_new(stream);
 
-       crlffilter =
-           g_mime_filter_crlf_new(TRUE,
-                                  FALSE);
+        crlffilter = g_mime_filter_dos2unix_new(TRUE);
        g_mime_stream_filter_add(GMIME_STREAM_FILTER(tmpstream), crlffilter);
        g_object_unref(crlffilter);