From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 214E06DE2DAD for ; Fri, 14 Jul 2017 06:12:16 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.000] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7yAhZqOtkqRr for ; Fri, 14 Jul 2017 06:12:15 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTP id 8CE0B6DE1F59 for ; Fri, 14 Jul 2017 06:12:15 -0700 (PDT) Received: from fifthhorseman.net (38.200.broadband6.iol.cz [88.101.200.38]) by che.mayfirst.org (Postfix) with ESMTPSA id EB36BF99D for ; Fri, 14 Jul 2017 09:12:13 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id DAFE420161; Fri, 14 Jul 2017 15:12:02 +0200 (CEST) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 2/3] clean up use of constants in g_mime_multipart_ wrappers Date: Fri, 14 Jul 2017 15:12:01 +0200 Message-Id: <20170714131202.24966-2-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714131202.24966-1-dkg@fifthhorseman.net> References: <20170603174754.16911-24-david@tethera.net> <20170714131202.24966-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 13:12:16 -0000 When compiling as C code (instead of C++) against gmime 3.0, gcc gives errors like the following: error: invalid conversion from ‘int’ to ‘GMimeDecryptFlags’ [-fpermissive] so use explicit *_NONE values instead. --- util/gmime-extra.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/gmime-extra.h b/util/gmime-extra.h index cf8d9a2d..8096dbe3 100644 --- a/util/gmime-extra.h +++ b/util/gmime-extra.h @@ -29,8 +29,8 @@ typedef GMimeAddressType GMimeRecipientType; #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_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, 0, NULL, out, err) -#define g_mime_multipart_signed_verify(mps,ctx,err) g_mime_multipart_signed_verify(mps, 0, err) +#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_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_parser_construct_message(p) g_mime_parser_construct_message (p, g_mime_parser_options_get_default ()) -- 2.13.2