Re: notmuch_query_add_tag_excluded and notmuch_query_search_threads

[notmuch-archives.git] / ca / c6a6f4d3dcd20031a029b263d955f3f3995d6e

Return-Path: <tomi.ollila@iki.fi>\r
X-Original-To: notmuch@notmuchmail.org\r
Delivered-To: notmuch@notmuchmail.org\r
Received: from localhost (localhost [127.0.0.1])\r
        by olra.theworths.org (Postfix) with ESMTP id A103E431FB6\r
        for <notmuch@notmuchmail.org>; Sun,  7 Apr 2013 12:07:44 -0700 (PDT)\r
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
X-Spam-Flag: NO\r
X-Spam-Score: 0\r
X-Spam-Level: \r
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
        autolearn=disabled\r
Received: from olra.theworths.org ([127.0.0.1])\r
        by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
        with ESMTP id nyh7CrEnrElR for <notmuch@notmuchmail.org>;\r
        Sun,  7 Apr 2013 12:07:44 -0700 (PDT)\r
Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
        by olra.theworths.org (Postfix) with ESMTP id EA25F431FAE\r
        for <notmuch@notmuchmail.org>; Sun,  7 Apr 2013 12:07:43 -0700 (PDT)\r
Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
        by guru.guru-group.fi (Postfix) with ESMTP id 362D1100093;\r
        Sun,  7 Apr 2013 22:07:43 +0300 (EEST)\r
From: Tomi Ollila <tomi.ollila@iki.fi>\r
To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org,\r
        Mark Walters <markwalters1009@gmail.com>\r
Subject: Re: [PATCH] cli: mime node: fix compiler warning when building\r
        against gmime 2.4\r
In-Reply-To: <1365248863-17947-1-git-send-email-jani@nikula.org>\r
References: <1365248863-17947-1-git-send-email-jani@nikula.org>\r
User-Agent: Notmuch/0.15.2+75~gd7fa7c4 (http://notmuchmail.org) Emacs/24.3.1\r
        (x86_64-unknown-linux-gnu)\r
X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
        $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
        !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
Date: Sun, 07 Apr 2013 22:07:42 +0300\r
Message-ID: <m2ip3yi2gx.fsf@guru.guru-group.fi>\r
MIME-Version: 1.0\r
Content-Type: text/plain; charset=utf-8\r
Content-Transfer-Encoding: quoted-printable\r
X-BeenThere: notmuch@notmuchmail.org\r
X-Mailman-Version: 2.1.13\r
Precedence: list\r
List-Id: "Use and development of the notmuch mail system."\r
        <notmuch.notmuchmail.org>\r
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
List-Post: <mailto:notmuch@notmuchmail.org>\r
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
X-List-Received-Date: Sun, 07 Apr 2013 19:07:44 -0000\r
\r
On Sat, Apr 06 2013, Jani Nikula <jani@nikula.org> wrote:\r
\r
> commit d487ef9e58bcd193118f19f771d5ef3984616be5\r
> Author: Jani Nikula <jani@nikula.org>\r
> Date:   Sat Mar 30 15:53:16 2013 +0200\r
>\r
>     cli: mime node: abstract decryption and signature verification\r
>\r
> introduced a compiler warning, reported by Mark Walters, when building\r
> against gmime 2.4:\r
>\r
> mime-node.c:224:9: warning: assignment discards =E2=80=98const=E2=80=99 q=\r
ualifier from\r
> pointer target type [enabled by default]\r
>\r
> Pass the non-const signature validity to the destructor to fix this.\r
>\r
> ---\r
>\r
> Not even compile tested as I don't have gmime 2.4 on any\r
> systems... Mark, please build and run the tests with this. Thanks.\r
\r
I can confirm this patch removes the compilation warning. I looked the\r
impmementation though the glasses which say gmime-2.4 support is going\r
to be deprecated in somewhat near future and I think it is good.\r
\r
Tomi\r
\r
\r
> ---\r
>  mime-node.c |   13 ++++++++-----\r
>  1 file changed, 8 insertions(+), 5 deletions(-)\r
>\r
> diff --git a/mime-node.c b/mime-node.c\r
> index 851f963..fd9e4a4 100644\r
> --- a/mime-node.c\r
> +++ b/mime-node.c\r
> @@ -217,11 +217,12 @@ _signature_validity_free (GMimeSignatureValidity **=\r
proxy)\r
>=20=20\r
>  /* Set up signature validity destructor (GMime 2.4) */\r
>  static void\r
> -set_signature_validity_destructor (mime_node_t *node)\r
> +set_signature_validity_destructor (mime_node_t *node,\r
> +                                GMimeSignatureValidity *sig_validity)\r
>  {\r
>      GMimeSignatureValidity **proxy =3D talloc (node, GMimeSignatureValid=\r
ity *);\r
>      if (proxy) {\r
> -     *proxy =3D node->sig_validity;\r
> +     *proxy =3D sig_validity;\r
>       talloc_set_destructor (proxy, _signature_validity_free);\r
>      }\r
>  }\r
> @@ -232,12 +233,14 @@ node_verify (mime_node_t *node, GMimeObject *part,\r
>            notmuch_crypto_context_t *cryptoctx)\r
>  {\r
>      GError *err =3D NULL;\r
> +    GMimeSignatureValidity *sig_validity;\r
>=20=20\r
>      node->verify_attempted =3D TRUE;\r
> -    node->sig_validity =3D g_mime_multipart_signed_verify\r
> +    sig_validity =3D g_mime_multipart_signed_verify\r
>       (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);\r
> -    if (node->sig_validity) {\r
> -     set_signature_validity_destructor (node);\r
> +    node->sig_validity =3D sig_validity;\r
> +    if (sig_validity) {\r
> +     set_signature_validity_destructor (node, sig_validity);\r
>      } else {\r
>       fprintf (stderr, "Failed to verify signed part: %s\n",\r
>                err ? err->message : "no error explanation given");\r
> --=20\r
> 1.7.10.4\r
>\r
> _______________________________________________\r
> notmuch mailing list\r
> notmuch@notmuchmail.org\r
> http://notmuchmail.org/mailman/listinfo/notmuch\r