From 29aae440fb64e8811508e1a803ee524c752b3565 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 4 Aug 2011 09:43:45 +0200 Subject: [PATCH] Fix up ABI symbols after GTlsDatabase merge. https://bugzilla.gnome.org/show_bug.cgi?id=636572 --- gio/gio.symbols | 28 ++++++++++++++++++++++++---- gio/gtlsinteraction.c | 6 +++--- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/gio/gio.symbols b/gio/gio.symbols index a1ee3b0..da4ec6c 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -1415,6 +1415,8 @@ g_tcp_wrapper_connection_new g_tls_backend_get_certificate_type g_tls_backend_get_client_connection_type g_tls_backend_get_default +g_tls_backend_get_default_database +g_tls_backend_get_file_database_type g_tls_backend_get_server_connection_type g_tls_backend_get_type g_tls_backend_supports_tls @@ -1429,6 +1431,7 @@ g_tls_certificate_new_from_pem g_tls_certificate_verify g_tls_connection_emit_accept_certificate g_tls_connection_get_certificate +g_tls_connection_get_database g_tls_connection_get_interaction g_tls_connection_get_peer_certificate g_tls_connection_get_peer_certificate_errors @@ -1440,6 +1443,7 @@ g_tls_connection_handshake g_tls_connection_handshake_async g_tls_connection_handshake_finish g_tls_connection_set_certificate +g_tls_connection_set_database g_tls_connection_set_interaction g_tls_connection_set_rehandshake_mode g_tls_connection_set_require_close_notify @@ -1455,10 +1459,18 @@ g_tls_client_connection_set_use_ssl3 g_tls_client_connection_set_validation_flags g_tls_server_connection_get_type g_tls_server_connection_new +g_tls_database_create_certificate_handle g_tls_database_get_type -g_tls_database_lookup_issuer -g_tls_database_lookup_issuer_async -g_tls_database_lookup_issuer_finish +g_tls_database_lookup_certificate_for_handle +g_tls_database_lookup_certificate_for_handle_async +g_tls_database_lookup_certificate_for_handle_finish +g_tls_database_lookup_certificate_issuer +g_tls_database_lookup_certificate_issuer_async +g_tls_database_lookup_certificate_issuer_finish +g_tls_database_lookup_certificates_issued_by +g_tls_database_lookup_certificates_issued_by_async +g_tls_database_lookup_certificates_issued_by_finish +g_tls_database_lookup_flags_get_type g_tls_database_verify_chain g_tls_database_verify_chain_async g_tls_database_verify_chain_finish @@ -1466,11 +1478,19 @@ g_tls_file_database_get_type g_tls_file_database_new g_tls_interaction_get_type g_tls_interaction_ask_password +g_tls_interaction_ask_password_async g_tls_interaction_ask_password_finish +g_tls_interaction_result_get_type +g_tls_password_flags_get_type g_tls_password_get_type g_tls_password_get_value +g_tls_password_get_warning +g_tls_password_new +g_tls_password_set_description +g_tls_password_set_flags g_tls_password_set_value -g_tls_password_take_value +g_tls_password_set_value_full +g_tls_password_set_warning g_tls_password_get_flags g_tls_password_get_description g_time_zone_monitor_get_type diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c index 2e1f7ad..12aaab3 100644 --- a/gio/gtlsinteraction.c +++ b/gio/gtlsinteraction.c @@ -68,14 +68,14 @@ G_DEFINE_TYPE (GTlsInteraction, g_tls_interaction, G_TYPE_OBJECT); -GTlsInteractionResult +static GTlsInteractionResult g_tls_interaction_default_ask_password (GTlsInteraction *interaction, GTlsPassword *password) { return G_TLS_INTERACTION_UNHANDLED; } -void +static void g_tls_interaction_default_ask_password_async (GTlsInteraction *interaction, GTlsPassword *password, GAsyncReadyCallback callback, @@ -89,7 +89,7 @@ g_tls_interaction_default_ask_password_async (GTlsInteraction *interaction, g_object_unref (res); } -GTlsInteractionResult +static GTlsInteractionResult g_tls_interaction_default_ask_password_finish (GTlsInteraction *interaction, GAsyncResult *result) { -- 2.7.4