mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-02 15:33:39 +02:00
Revert "gtlscertificate: Add certificate-bytes and private-key-bytes props"
* In order to add contstruct properties to an abstract base
calls, and retain ABI stability, the base class must add a
default implementation of those properties.
* We cannot add a default implementation of certificate-bytes
or private-key-bytes since certificate and private-key properties
are writable on construct-only.
This reverts commit 541c985869
.
https://bugzilla.gnome.org/show_bug.cgi?id=682081
This commit is contained in:
@@ -81,10 +81,8 @@ enum
|
||||
PROP_CERTIFICATE_0,
|
||||
|
||||
PROP_CERT_CERTIFICATE,
|
||||
PROP_CERT_CERTIFICATE_BYTES,
|
||||
PROP_CERT_CERTIFICATE_PEM,
|
||||
PROP_CERT_PRIVATE_KEY,
|
||||
PROP_CERT_PRIVATE_KEY_BYTES,
|
||||
PROP_CERT_PRIVATE_KEY_PEM,
|
||||
PROP_CERT_ISSUER
|
||||
};
|
||||
@@ -135,9 +133,7 @@ g_test_tls_certificate_set_property (GObject *object,
|
||||
cert->key_pem = g_value_dup_string (value);
|
||||
break;
|
||||
case PROP_CERT_CERTIFICATE:
|
||||
case PROP_CERT_CERTIFICATE_BYTES:
|
||||
case PROP_CERT_PRIVATE_KEY:
|
||||
case PROP_CERT_PRIVATE_KEY_BYTES:
|
||||
case PROP_CERT_ISSUER:
|
||||
/* ignore */
|
||||
break;
|
||||
@@ -166,10 +162,8 @@ g_test_tls_certificate_class_init (GTestTlsCertificateClass *certificate_class)
|
||||
gobject_class->finalize = g_test_tls_certificate_finalize;
|
||||
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_CERTIFICATE, "certificate");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_CERTIFICATE_BYTES, "certificate-bytes");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_CERTIFICATE_PEM, "certificate-pem");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_PRIVATE_KEY, "private-key");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_PRIVATE_KEY_BYTES, "private-key-bytes");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_PRIVATE_KEY_PEM, "private-key-pem");
|
||||
g_object_class_override_property (gobject_class, PROP_CERT_ISSUER, "issuer");
|
||||
}
|
||||
|
Reference in New Issue
Block a user