[balsa/gmime3: 10/48] g_mime_filter_crlf_new() is no more
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gmime3: 10/48] g_mime_filter_crlf_new() is no more
- Date: Wed, 18 Dec 2019 14:31:53 +0000 (UTC)
commit e1c4dc41705d8225de098dc248a3ac9235509e60
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Thu Nov 21 07:32:01 2019 -0800
g_mime_filter_crlf_new() is no more
and is replaced by g_mime_filter_unix2dos() for CRLF filtering,
and g_mime_filter_smtp() for dot-stuffing.
libbalsa/mailbox_imap.c | 6 ++----
libbalsa/mailbox_maildir.c | 4 +---
libbalsa/mailbox_mbox.c | 3 +--
libbalsa/mailbox_mh.c | 3 +--
libbalsa/message.c | 4 +---
libbalsa/send.c | 9 +++++++--
6 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index f02ab34e6..548d0160b 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -2166,7 +2166,7 @@ get_struct_from_cache(LibBalsaMailbox *mailbox, LibBalsaMessage *message,
fstream = g_mime_stream_filter_new(stream);
g_object_unref(stream);
- filter = g_mime_filter_crlf_new(FALSE, FALSE);
+ filter = g_mime_filter_unix2dos(FALSE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(fstream), filter);
g_object_unref(filter);
@@ -2723,9 +2723,7 @@ libbalsa_mailbox_imap_add_messages(LibBalsaMailbox * mailbox,
tmpstream = g_mime_stream_filter_new(stream);
- crlffilter =
- g_mime_filter_crlf_new(TRUE,
- FALSE);
+ crlffilter = g_mime_filter_unix2dos(FALSE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(tmpstream), crlffilter);
g_object_unref(crlffilter);
diff --git a/libbalsa/mailbox_maildir.c b/libbalsa/mailbox_maildir.c
index 72e9b8d3a..6551322a5 100644
--- a/libbalsa/mailbox_maildir.c
+++ b/libbalsa/mailbox_maildir.c
@@ -893,9 +893,7 @@ lbm_maildir_add_message(LibBalsaMailboxLocal * local,
out_stream = g_mime_stream_fs_new(fd);
in_stream = g_mime_stream_filter_new(stream);
- crlffilter =
- g_mime_filter_crlf_new(FALSE,
- FALSE);
+ crlffilter = g_mime_filter_unix2dos(FALSE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(in_stream), crlffilter);
g_object_unref(crlffilter);
diff --git a/libbalsa/mailbox_mbox.c b/libbalsa/mailbox_mbox.c
index 8b073b41c..c75112861 100644
--- a/libbalsa/mailbox_mbox.c
+++ b/libbalsa/mailbox_mbox.c
@@ -1838,8 +1838,7 @@ lbm_mbox_armored_stream(GMimeStream * stream)
fstream = g_mime_stream_filter_new(stream);
- filter = g_mime_filter_crlf_new(FALSE,
- FALSE);
+ filter = g_mime_filter_unix2dos(FALSE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(fstream), filter);
g_object_unref(filter);
diff --git a/libbalsa/mailbox_mh.c b/libbalsa/mailbox_mh.c
index 611bde062..02a1227c5 100644
--- a/libbalsa/mailbox_mh.c
+++ b/libbalsa/mailbox_mh.c
@@ -1075,8 +1075,7 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
}
out_stream = g_mime_stream_fs_new(fd);
- crlffilter = g_mime_filter_crlf_new(FALSE,
- FALSE);
+ crlffilter = g_mime_filter_unix2dos(FALSE);
in_stream = g_mime_stream_filter_new(stream);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(in_stream), crlffilter);
g_object_unref(crlffilter);
diff --git a/libbalsa/message.c b/libbalsa/message.c
index 811e41356..fbdc41240 100644
--- a/libbalsa/message.c
+++ b/libbalsa/message.c
@@ -1336,9 +1336,7 @@ libbalsa_message_load_envelope_from_stream(LibBalsaMessage *message,
gmime_stream_filter =
g_mime_stream_filter_new(gmime_stream);
- gmime_filter_crlf =
- g_mime_filter_crlf_new(FALSE,
- FALSE);
+ gmime_filter_crlf = g_mime_filter_unix2dos(FALSE);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(gmime_stream_filter),
gmime_filter_crlf);
g_object_unref(gmime_filter_crlf);
diff --git a/libbalsa/send.c b/libbalsa/send.c
index c84b63c44..901ea1146 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1742,8 +1742,13 @@ libbalsa_fill_msg_queue_item_from_queu(LibBalsaMessage *message,
g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
g_object_unref(filter);
- /* add CRLF, encode dot */
- filter = g_mime_filter_crlf_new(TRUE, TRUE);
+ /* add CRLF */
+ filter = g_mime_filter_unix2dos_new(TRUE);
+ g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
+ g_object_unref(filter);
+
+ /* encode dot */
+ filter = g_mime_filter_smtp_data_new();
g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter);
g_object_unref(filter);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]