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

gmime-extra: drop compat layer for g_mime_multipart_encrypted_decrypt

Browse source 
In practice, we're going to see this function invoked differently
depending on which gmime we build against.  The compatibility layer
forces our code into the lowest-common-denominator -- unable to make
use of new features even when built against a newer version.

Dropping the compatibility layer paves the way for clearer use of
features from GMime 3.0 in future commits.
This commit is contained in:
Daniel Kahn Gillmor 2017-10-10 01:49:10 -04:00 committed by David Bremner
parent ee5df7d7db
commit bcd6229d26
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mime-node.c
View file

@ -200,7 +200,11 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
node->decrypt_attempted = true; node->decrypt_attempted = true;
node->decrypted_child = g_mime_multipart_encrypted_decrypt node->decrypted_child = g_mime_multipart_encrypted_decrypt
#if (GMIME_MAJOR_VERSION < 3)
(encrypteddata, cryptoctx, &decrypt_result, &err); (encrypteddata, cryptoctx, &decrypt_result, &err);
#else
(encrypteddata, GMIME_DECRYPT_NONE, NULL, &decrypt_result, &err);
#endif
if (! node->decrypted_child) { if (! node->decrypted_child) {
fprintf (stderr, "Failed to decrypt part: %s\n", fprintf (stderr, "Failed to decrypt part: %s\n",
err ? err->message : "no error explanation given"); err ? err->message : "no error explanation given");

1
util/gmime-extra.h
View file

@ -29,7 +29,6 @@ GMimeStream *g_mime_stream_stdout_new(void);
#define g_mime_init(flags) g_mime_init() #define g_mime_init(flags) g_mime_init()
#define g_mime_message_add_recipient(m,t,n,a) g_mime_message_add_mailbox (m,t,n,a) #define g_mime_message_add_recipient(m,t,n,a) g_mime_message_add_mailbox (m,t,n,a)
#define g_mime_message_set_subject(m,s) g_mime_message_set_subject(m,s,NULL) #define g_mime_message_set_subject(m,s) g_mime_message_set_subject(m,s,NULL)
#define g_mime_multipart_encrypted_decrypt(mpe,ctx,out,err) g_mime_multipart_encrypted_decrypt(mpe, GMIME_DECRYPT_NONE, NULL, out, err)
#define g_mime_multipart_signed_verify(mps,ctx,err) g_mime_multipart_signed_verify(mps, GMIME_ENCRYPT_NONE, err) #define g_mime_multipart_signed_verify(mps,ctx,err) g_mime_multipart_signed_verify(mps, GMIME_ENCRYPT_NONE, err)
#define g_mime_object_write_to_stream(o,s) g_mime_object_write_to_stream (o,NULL,s) #define g_mime_object_write_to_stream(o,s) g_mime_object_write_to_stream (o,NULL,s)
#define g_mime_object_set_header(o,h,v) g_mime_object_set_header (o,h,v,NULL) #define g_mime_object_set_header(o,h,v) g_mime_object_set_header (o,h,v,NULL)