luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/tingping/gdummytlsconnection-properties' into 'master'

Browse Source 
gdummytlsconnection: Add missing overrides for ALPN properties

See merge request GNOME/glib!1409
This commit is contained in:
Philip Withnall 2020-03-09 20:21:43 +00:00
commit f818f50cbc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdummytlsbackend.c
View File

@ -235,7 +235,9 @@ enum
PROP_CONN_SERVER_IDENTITY, PROP_CONN_SERVER_IDENTITY,
PROP_CONN_USE_SSL3, PROP_CONN_USE_SSL3,
PROP_CONN_ACCEPTED_CAS, PROP_CONN_ACCEPTED_CAS,
PROP_CONN_AUTHENTICATION_MODE PROP_CONN_AUTHENTICATION_MODE,
PROP_CONN_ADVERTISED_PROTOCOLS,
PROP_CONN_NEGOTIATED_PROTOCOL,
}; };
static void g_dummy_tls_connection_initable_iface_init (GInitableIface *iface); static void g_dummy_tls_connection_initable_iface_init (GInitableIface *iface);
@ -301,6 +303,8 @@ g_dummy_tls_connection_class_init (GDummyTlsConnectionClass *connection_class)
g_object_class_override_property (gobject_class, PROP_CONN_USE_SSL3, "use-ssl3"); g_object_class_override_property (gobject_class, PROP_CONN_USE_SSL3, "use-ssl3");
g_object_class_override_property (gobject_class, PROP_CONN_ACCEPTED_CAS, "accepted-cas"); g_object_class_override_property (gobject_class, PROP_CONN_ACCEPTED_CAS, "accepted-cas");
g_object_class_override_property (gobject_class, PROP_CONN_AUTHENTICATION_MODE, "authentication-mode"); g_object_class_override_property (gobject_class, PROP_CONN_AUTHENTICATION_MODE, "authentication-mode");
g_object_class_override_property (gobject_class, PROP_CONN_ADVERTISED_PROTOCOLS, "advertised-protocols");
g_object_class_override_property (gobject_class, PROP_CONN_NEGOTIATED_PROTOCOL, "negotiated-protocol");
} }
static void static void