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 712F16DE0355 for ; Sat, 3 Jun 2017 10:48:19 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 9HHJA6j4j3dV for ; Sat, 3 Jun 2017 10:48:19 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 49CB66DE096A for ; Sat, 3 Jun 2017 10:48:15 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1dHD8t-0002Oq-SN; Sat, 03 Jun 2017 13:47:15 -0400 Received: (nullmailer pid 17104 invoked by uid 1000); Sat, 03 Jun 2017 17:48:04 -0000 From: David Bremner To: notmuch@notmuchmail.org, notmuch@freelists.org Subject: [PATCH 15/23] util: fake gmime-2.6 compatible API for gmime-3.0 Date: Sat, 3 Jun 2017 14:47:46 -0300 Message-Id: <20170603174754.16911-16-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170603174754.16911-1-david@tethera.net> References: <20170603174754.16911-1-david@tethera.net> 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: Sat, 03 Jun 2017 17:48:19 -0000 Several functions have added arguments which accept NULL and provide hopefully sensible defaults. Use macros to minimize source changes. --- util/gmime-extra.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/util/gmime-extra.h b/util/gmime-extra.h index fef4f425..3c16e46e 100644 --- a/util/gmime-extra.h +++ b/util/gmime-extra.h @@ -16,6 +16,29 @@ GMimeStream *g_mime_stream_stdout_new(void); #else /* GMime >= 3.0 */ typedef GMimeAddressType GMimeRecipientType; + +#define GMIME_ENABLE_RFC_2047_WORKAROUNDS 0xdeadbeef +#define g_mime_content_type_to_string(c) g_mime_content_type_get_mime_type (c) +#define g_mime_filter_crlf_new(encode,dots) g_mime_filter_dos2unix_new (FALSE) +#define g_mime_gpg_context_new(func,path) g_mime_gpg_context_new () +#define g_mime_gpg_context_set_use_agent(ctx,val) /*ignore*/ +#define g_mime_gpg_context_set_always_trust(ctx,val) /*ignore*/ +#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_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 ()) +#define g_mime_part_get_content_object(p) g_mime_part_get_content (p) +#define g_mime_pkcs7_context_new(arg) g_mime_pkcs7_context_new() +#define g_mime_pkcs7_context_set_always_trust(ctx,val) /*ignore*/ +#define g_mime_signature_get_errors(sig) g_mime_signature_get_status (sig) +#define g_mime_utils_header_decode_text(txt) g_mime_utils_header_decode_text (NULL, txt) +#define internet_address_to_string(ia,encode) internet_address_to_string (ia,NULL,encode) +#define internet_address_list_parse_string(str) internet_address_list_parse (NULL,str) +typedef GMimeAddressType GMimeRecipientType; #endif /** -- 2.11.0