debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert non-UTF-8 parts to UTF-8 before indexing them

Browse source 
This fixes a bug that didn't allow to search for non-ASCII words such
parts. The code here was copied from show_text_part_content(), because
the show command already does the needed conversion when showing the
message.
This commit is contained in:
Michal Sojka 2012-02-24 08:36:22 +01:00 committed by David Bremner
parent 74f8f15adc
commit 40edc971a8
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/index.cc
View file

@ -315,6 +315,7 @@ _index_mime_part (notmuch_message_t *message,
GByteArray *byte_array; GByteArray *byte_array;
GMimeContentDisposition *disposition; GMimeContentDisposition *disposition;
char *body; char *body;
const char *charset;
if (! part) { if (! part) {
fprintf (stderr, "Warning: Not indexing empty mime part.\n"); fprintf (stderr, "Warning: Not indexing empty mime part.\n");
@ -390,6 +391,20 @@ _index_mime_part (notmuch_message_t *message,
g_mime_stream_filter_add (GMIME_STREAM_FILTER (filter), g_mime_stream_filter_add (GMIME_STREAM_FILTER (filter),
discard_uuencode_filter); discard_uuencode_filter);
charset = g_mime_object_get_content_type_parameter (part, "charset");
if (charset) {
GMimeFilter *charset_filter;
charset_filter = g_mime_filter_charset_new (charset, "UTF-8");
/* This result can be NULL for things like "unknown-8bit".
* Don't set a NULL filter as that makes GMime print
* annoying assertion-failure messages on stderr. */
if (charset_filter) {
g_mime_stream_filter_add (GMIME_STREAM_FILTER (filter),
charset_filter);
g_object_unref (charset_filter);
}
}
wrapper = g_mime_part_get_content_object (GMIME_PART (part)); wrapper = g_mime_part_get_content_object (GMIME_PART (part));
if (wrapper) if (wrapper)
g_mime_data_wrapper_write_to_stream (wrapper, filter); g_mime_data_wrapper_write_to_stream (wrapper, filter);