From: David Bremner <david@tethera.net>
Date: Mon, 25 Apr 2022 12:07:45 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.37_rc0~127
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=e3ad0087f3453c89871acac8b11da8bab1ac54df;hp=a9b5f8959a20bbce774dec8a65a8b207555e52bd

Merge branch 'release'
---

diff --git a/configure b/configure
index 2f6d8b68..30fee6ab 100755
--- a/configure
+++ b/configure
@@ -564,7 +564,6 @@ int main () {
     GMimeSignature *sig = NULL;
     GMimeCertificate *cert = NULL;
     GMimeObject *output = NULL;
-    GMimeValidity validity = GMIME_VALIDITY_UNKNOWN;
     int len;
 
     g_mime_init ();
@@ -586,7 +585,7 @@ int main () {
     cert = g_mime_signature_get_certificate (sig);
     if (cert == NULL) return !! fprintf (stderr, "no GMimeCertificate found\n");
 #ifdef CHECK_VALIDITY
-    validity = g_mime_certificate_get_id_validity (cert);
+    GMimeValidity validity = g_mime_certificate_get_id_validity (cert);
     if (validity != GMIME_VALIDITY_FULL) return !! fprintf (stderr, "Got validity %d, expected %d\n", validity, GMIME_VALIDITY_FULL);
 #endif
 #ifdef CHECK_EMAIL