[glib-networking] Guard new APIs with GLIB_CHECK_VERSION



commit e1b99ff312bba9e18556aa46a19719e745cf91ee
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Wed Jun 23 12:43:57 2021 -0500

    Guard new APIs with GLIB_CHECK_VERSION
    
    Oops, I forgot to do this before merging the previous commit.

 tls/gnutls/gtlscertificate-gnutls.c   | 2 ++
 tls/openssl/gtlscertificate-openssl.c | 2 ++
 tls/tests/certificate.c               | 4 ++++
 3 files changed, 8 insertions(+)
---
diff --git a/tls/gnutls/gtlscertificate-gnutls.c b/tls/gnutls/gtlscertificate-gnutls.c
index 4c27587..91a9448 100644
--- a/tls/gnutls/gtlscertificate-gnutls.c
+++ b/tls/gnutls/gtlscertificate-gnutls.c
@@ -456,10 +456,12 @@ g_tls_certificate_gnutls_class_init (GTlsCertificateGnutlsClass *klass)
   g_object_class_override_property (gobject_class, PROP_ISSUER, "issuer");
   g_object_class_override_property (gobject_class, PROP_PKCS11_URI, "pkcs11-uri");
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY_PKCS11_URI, "private-key-pkcs11-uri");
+#if GLIB_CHECK_VERSION(2, 69, 0)
   g_object_class_override_property (gobject_class, PROP_NOT_VALID_BEFORE, "not-valid-before");
   g_object_class_override_property (gobject_class, PROP_NOT_VALID_AFTER, "not-valid-after");
   g_object_class_override_property (gobject_class, PROP_SUBJECT_NAME, "subject-name");
   g_object_class_override_property (gobject_class, PROP_ISSUER_NAME, "issuer-name");
+#endif
 }
 
 static void
diff --git a/tls/openssl/gtlscertificate-openssl.c b/tls/openssl/gtlscertificate-openssl.c
index dd9664c..f36e1e6 100644
--- a/tls/openssl/gtlscertificate-openssl.c
+++ b/tls/openssl/gtlscertificate-openssl.c
@@ -406,10 +406,12 @@ g_tls_certificate_openssl_class_init (GTlsCertificateOpensslClass *klass)
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY, "private-key");
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY_PEM, "private-key-pem");
   g_object_class_override_property (gobject_class, PROP_ISSUER, "issuer");
+#if GLIB_CHECK_VERSION(2, 69, 0)
   g_object_class_override_property (gobject_class, PROP_NOT_VALID_BEFORE, "not-valid-before");
   g_object_class_override_property (gobject_class, PROP_NOT_VALID_AFTER, "not-valid-after");
   g_object_class_override_property (gobject_class, PROP_SUBJECT_NAME, "subject-name");
   g_object_class_override_property (gobject_class, PROP_ISSUER_NAME, "issuer-name");
+#endif
 }
 
 static void
diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index 50b7dc3..dadd04e 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -576,6 +576,7 @@ test_certificate_is_same (void)
   g_object_unref (three);
 }
 
+#if GLIB_CHECK_VERSION(2, 69, 0)
 static void
 test_certificate_not_valid_before (void)
 {
@@ -657,6 +658,7 @@ test_certificate_issuer_name (void)
   g_free (actual);
   g_object_unref (cert);
 }
+#endif
 
 int
 main (int   argc,
@@ -716,10 +718,12 @@ main (int   argc,
 
   g_test_add_func ("/tls/" BACKEND "/certificate/is-same", test_certificate_is_same);
 
+#if GLIB_CHECK_VERSION(2, 69, 0)
   g_test_add_func ("/tls/" BACKEND "/certificate/not-valid-before", test_certificate_not_valid_before);
   g_test_add_func ("/tls/" BACKEND "/certificate/not-valid-after", test_certificate_not_valid_after);
   g_test_add_func ("/tls/" BACKEND "/certificate/subject-name", test_certificate_subject_name);
   g_test_add_func ("/tls/" BACKEND "/certificate/issuer-name", test_certificate_issuer_name);
+#endif
 
   return g_test_run();
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]