diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-05-02 09:19:45 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-05-03 06:57:27 -0300 |
| commit | bbe3015b3ea503b2834811f6cdd7276f9742faa1 (patch) | |
| tree | 767ac1618dcb7140bf70545daeffdaa0182592d6 /lib | |
| parent | 582f255aeba3998428fa489dc22c735bd0b88143 (diff) | |
gmime-cleanup: pass NULL arguments explicitly where GMime 3.0 expects it
Several GMime 2.6 functions sprouted a change in the argument order in
GMime 3.0. We had a compatibility layer here to be able to handle
compiling against both GMime 2.6 and 3.0. Now that we're using 3.0
only, rip out the compatibility layer for those functions with changed
argument lists, and explicitly use the 3.0 argument lists.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/message-file.c | 4 | ||||
| -rw-r--r-- | lib/thread.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/message-file.c b/lib/message-file.c index 214f3c1d..c507ee34 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -212,7 +212,7 @@ static char * _extend_header (char *combined, const char *value) { char *decoded; - decoded = g_mime_utils_header_decode_text (value); + decoded = g_mime_utils_header_decode_text (NULL, value); if (! decoded) { if (combined) { g_free (combined); @@ -296,7 +296,7 @@ _notmuch_message_file_get_header (notmuch_message_file_t *message, value = g_mime_object_get_header (GMIME_OBJECT (message->message), header); if (value) - decoded = g_mime_utils_header_decode_text (value); + decoded = g_mime_utils_header_decode_text (NULL, value); else decoded = g_strdup (""); } diff --git a/lib/thread.cc b/lib/thread.cc index 47c90664..c9c9398f 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -284,7 +284,7 @@ _thread_add_message (notmuch_thread_t *thread, from = notmuch_message_get_header (message, "from"); if (from) - list = internet_address_list_parse_string (from); + list = internet_address_list_parse (NULL, from); if (list) { address = internet_address_list_get_address (list, 0); |