diff options
| author |  Jani Nikula <jani@nikula.org> | 2013-09-11 20:36:43 +0300 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2013-09-14 14:13:43 -0300 |
| commit | 71521f06b00a01c5b0eaea5f5f624fe57ed7f426 (patch) | |
| tree | 3defd3edcef6eee7141fb88fbd9ec341d0d566b1 | |
| parent | 59e311d9af6cb6b5801a90cf87dcd18c8eac0853 (diff) | |
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
| -rw-r--r-- | lib/database.cc | 2 | ||||
| -rw-r--r-- | lib/index.cc | 2 | ||||
| -rw-r--r-- | lib/message-file.c | 2 | ||||
| -rw-r--r-- | notmuch.c | 2 | ||||
| -rwxr-xr-x | test/encoding | 3 |
5 files changed, 4 insertions, 7 deletions
diff --git a/lib/database.cc b/lib/database.cc index 5cc07658..bb4f1801 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -655,7 +655,7 @@ notmuch_database_open (const char *path, /* Initialize gmime */ if (! initialized) { - g_mime_init (0); + g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); initialized = 1; } diff --git a/lib/index.cc b/lib/index.cc index a2edd6d9..78c18cf3 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -440,7 +440,7 @@ _notmuch_message_index_file (notmuch_message_t *message, static bool mbox_warning = false; if (! initialized) { - g_mime_init (0); + g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); initialized = 1; } diff --git a/lib/message-file.c b/lib/message-file.c index 4d9af89f..a2850c27 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -228,7 +228,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message, is_received = (strcmp(header_desired,"received") == 0); if (! initialized) { - g_mime_init (0); + g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); initialized = 1; } @@ -264,7 +264,7 @@ main (int argc, char *argv[]) local = talloc_new (NULL); - g_mime_init (0); + g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); #if !GLIB_CHECK_VERSION(2, 35, 1) g_type_init (); #endif diff --git a/test/encoding b/test/encoding index 7372b6b0..8609652c 100755 --- a/test/encoding +++ b/test/encoding @@ -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_begin_subtest "RFC 2047 encoded word with spaces" -test_subtest_known_broken add_message '[subject]="=?utf-8?q?encoded word with spaces?="' 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_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?="' 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_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?=" ' 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)" |