[glib-networking] Revert "Guard new APIs with GLIB_CHECK_VERSION"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Revert "Guard new APIs with GLIB_CHECK_VERSION"
- Date: Wed, 23 Jun 2021 18:18:31 +0000 (UTC)
commit ed608d6614f17acc16b735c57b3daaed2908590c
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Wed Jun 23 13:17:04 2021 -0500
Revert "Guard new APIs with GLIB_CHECK_VERSION"
This reverts commit e1b99ff312bba9e18556aa46a19719e745cf91ee.
Instead, let's require unreleased GLib. That's fine.
tls/gnutls/gtlscertificate-gnutls.c | 2 --
tls/openssl/gtlscertificate-openssl.c | 2 --
tls/tests/certificate.c | 4 ----
3 files changed, 8 deletions(-)
---
diff --git a/tls/gnutls/gtlscertificate-gnutls.c b/tls/gnutls/gtlscertificate-gnutls.c
index 91a9448..4c27587 100644
--- a/tls/gnutls/gtlscertificate-gnutls.c
+++ b/tls/gnutls/gtlscertificate-gnutls.c
@@ -456,12 +456,10 @@ 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 f36e1e6..dd9664c 100644
--- a/tls/openssl/gtlscertificate-openssl.c
+++ b/tls/openssl/gtlscertificate-openssl.c
@@ -406,12 +406,10 @@ 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 dadd04e..50b7dc3 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -576,7 +576,6 @@ test_certificate_is_same (void)
g_object_unref (three);
}
-#if GLIB_CHECK_VERSION(2, 69, 0)
static void
test_certificate_not_valid_before (void)
{
@@ -658,7 +657,6 @@ test_certificate_issuer_name (void)
g_free (actual);
g_object_unref (cert);
}
-#endif
int
main (int argc,
@@ -718,12 +716,10 @@ 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]