mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 12:28:09 +01:00
lib/cli: pass GMIME_ENABLE_RFC2047_WORKAROUNDS to g_mime_init()
As explained by Jeffrey Stedfast, the author of GMime, quoted in [1]: > Passing the GMIME_ENABLE_RFC2047_WORKAROUNDS flag to g_mime_init() > *should* solve the decoding problem mentioned in the thread. This > flag should be safe to pass into g_mime_init() without any bad side > effects and my unit tests do test that code-path. The thread being referred to is [2]. [1] id:87bo56viyo.fsf@nikula.org [2] id:08cb1dcd-c5db-4e33-8b09-7730cb3d59a2@gmail.com
This commit is contained in:
parent
59e311d9af
commit
71521f06b0
5 changed files with 4 additions and 7 deletions
|
@ -655,7 +655,7 @@ notmuch_database_open (const char *path,
|
||||||
|
|
||||||
/* Initialize gmime */
|
/* Initialize gmime */
|
||||||
if (! initialized) {
|
if (! initialized) {
|
||||||
g_mime_init (0);
|
g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -440,7 +440,7 @@ _notmuch_message_index_file (notmuch_message_t *message,
|
||||||
static bool mbox_warning = false;
|
static bool mbox_warning = false;
|
||||||
|
|
||||||
if (! initialized) {
|
if (! initialized) {
|
||||||
g_mime_init (0);
|
g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -228,7 +228,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
|
||||||
is_received = (strcmp(header_desired,"received") == 0);
|
is_received = (strcmp(header_desired,"received") == 0);
|
||||||
|
|
||||||
if (! initialized) {
|
if (! initialized) {
|
||||||
g_mime_init (0);
|
g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -264,7 +264,7 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
local = talloc_new (NULL);
|
local = talloc_new (NULL);
|
||||||
|
|
||||||
g_mime_init (0);
|
g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
|
||||||
#if !GLIB_CHECK_VERSION(2, 35, 1)
|
#if !GLIB_CHECK_VERSION(2, 35, 1)
|
||||||
g_type_init ();
|
g_type_init ();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -30,19 +30,16 @@ output=$(notmuch search tučňáččí 2>&1 | notmuch_show_sanitize)
|
||||||
test_expect_equal "$output" "thread:0000000000000002 2001-01-05 [1/1] Notmuch Test Suite; ISO-8859-2 encoded message (inbox unread)"
|
test_expect_equal "$output" "thread:0000000000000002 2001-01-05 [1/1] Notmuch Test Suite; ISO-8859-2 encoded message (inbox unread)"
|
||||||
|
|
||||||
test_begin_subtest "RFC 2047 encoded word with spaces"
|
test_begin_subtest "RFC 2047 encoded word with spaces"
|
||||||
test_subtest_known_broken
|
|
||||||
add_message '[subject]="=?utf-8?q?encoded word with spaces?="'
|
add_message '[subject]="=?utf-8?q?encoded word with spaces?="'
|
||||||
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
||||||
test_expect_equal "$output" "thread:0000000000000003 2001-01-05 [1/1] Notmuch Test Suite; encoded word with spaces (inbox unread)"
|
test_expect_equal "$output" "thread:0000000000000003 2001-01-05 [1/1] Notmuch Test Suite; encoded word with spaces (inbox unread)"
|
||||||
|
|
||||||
test_begin_subtest "RFC 2047 encoded words back to back"
|
test_begin_subtest "RFC 2047 encoded words back to back"
|
||||||
test_subtest_known_broken
|
|
||||||
add_message '[subject]="=?utf-8?q?encoded-words-back?==?utf-8?q?to-back?="'
|
add_message '[subject]="=?utf-8?q?encoded-words-back?==?utf-8?q?to-back?="'
|
||||||
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
||||||
test_expect_equal "$output" "thread:0000000000000004 2001-01-05 [1/1] Notmuch Test Suite; encoded-words-backto-back (inbox unread)"
|
test_expect_equal "$output" "thread:0000000000000004 2001-01-05 [1/1] Notmuch Test Suite; encoded-words-backto-back (inbox unread)"
|
||||||
|
|
||||||
test_begin_subtest "RFC 2047 encoded words without space before or after"
|
test_begin_subtest "RFC 2047 encoded words without space before or after"
|
||||||
test_subtest_known_broken
|
|
||||||
add_message '[subject]="=?utf-8?q?encoded?=word without=?utf-8?q?space?=" '
|
add_message '[subject]="=?utf-8?q?encoded?=word without=?utf-8?q?space?=" '
|
||||||
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
output=$(notmuch search id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
|
||||||
test_expect_equal "$output" "thread:0000000000000005 2001-01-05 [1/1] Notmuch Test Suite; encodedword withoutspace (inbox unread)"
|
test_expect_equal "$output" "thread:0000000000000005 2001-01-05 [1/1] Notmuch Test Suite; encodedword withoutspace (inbox unread)"
|
||||||
|
|
Loading…
Reference in a new issue