diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-24 17:21:56 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-24 17:21:56 +0100 |
commit | b0de6c25a457ed1c67138c476c9df2b6896fa559 (patch) | |
tree | 272461109bd12a8fd57c985f7e4a4c0560a49b66 /gio/src | |
parent | b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa (diff) | |
download | glibmm-b0de6c25a457ed1c67138c476c9df2b6896fa559.tar.gz |
Gio::SocketClient, TlsClientConnection: Ignore some deprecations
g_socket_client_[set,get]_tls_validation_flags() and
g_tls_client_connection_[set,get]_validation_flags() are deprecated in
glib 2.72. They can't be deprecated in glibmm 2.70. Ignore the deprecations,
so it will still be possible to compile with warnings=fatal.
Diffstat (limited to 'gio/src')
-rw-r--r-- | gio/src/socketclient.ccg | 13 | ||||
-rw-r--r-- | gio/src/socketclient.hg | 19 | ||||
-rw-r--r-- | gio/src/tlsclientconnection.ccg | 17 | ||||
-rw-r--r-- | gio/src/tlsclientconnection.hg | 15 |
4 files changed, 57 insertions, 7 deletions
diff --git a/gio/src/socketclient.ccg b/gio/src/socketclient.ccg index 8f17c65d..e01cdf8d 100644 --- a/gio/src/socketclient.ccg +++ b/gio/src/socketclient.ccg @@ -125,4 +125,17 @@ SocketClient::connect_to_uri_async( gobj(), uri.c_str(), default_port, nullptr, &SignalProxy_async_callback, slot_copy); } +//TODO: Deprecate in glibmm 2.72. +G_GNUC_BEGIN_IGNORE_DEPRECATIONS +TlsCertificateFlags SocketClient::get_tls_validation_flags() const +{ + return static_cast<TlsCertificateFlags>(g_socket_client_get_tls_validation_flags(const_cast<GSocketClient*>(gobj()))); +} + +void SocketClient::set_tls_validation_flags(TlsCertificateFlags flags) +{ + g_socket_client_set_tls_validation_flags(gobj(), static_cast<GTlsCertificateFlags>(flags)); +} +G_GNUC_END_IGNORE_DEPRECATIONS + } // namespace Gio diff --git a/gio/src/socketclient.hg b/gio/src/socketclient.hg index ab1ba680..857617a7 100644 --- a/gio/src/socketclient.hg +++ b/gio/src/socketclient.hg @@ -136,15 +136,22 @@ public: _WRAP_METHOD(Glib::RefPtr<SocketConnection> connect_to_uri_finish(const Glib::RefPtr<AsyncResult>& result), g_socket_client_connect_to_uri_finish, errthrow) - _WRAP_METHOD(bool get_enable_proxy() const, g_socket_client_get_enable_proxy) _WRAP_METHOD(void set_enable_proxy(bool enable), g_socket_client_set_enable_proxy) - _WRAP_METHOD(bool get_tls() const, g_socket_client_get_tls) _WRAP_METHOD(void set_tls(bool tls = true), g_socket_client_set_tls) - _WRAP_METHOD(TlsCertificateFlags get_tls_validation_flags() const, g_socket_client_get_tls_validation_flags) - _WRAP_METHOD(void set_tls_validation_flags(TlsCertificateFlags flags), g_socket_client_set_tls_validation_flags) + + //TODO: Deprecate in glibmm 2.72. + _WRAP_METHOD_DOCS_ONLY(g_socket_client_get_tls_validation_flags) + TlsCertificateFlags get_tls_validation_flags() const; + _WRAP_METHOD_DOCS_ONLY(g_socket_client_set_tls_validation_flags) + void set_tls_validation_flags(TlsCertificateFlags flags); + _IGNORE(g_socket_client_get_tls_validation_flags, g_socket_client_set_tls_validation_flags) + //_WRAP_METHOD(TlsCertificateFlags get_tls_validation_flags() const, g_socket_client_get_tls_validation_flags, + // deprecated "Do not attempt to ignore validation errors.") + //_WRAP_METHOD(void set_tls_validation_flags(TlsCertificateFlags flags), g_socket_client_set_tls_validation_flags, + // deprecated "Do not attempt to ignore validation errors.") _WRAP_METHOD(Glib::RefPtr<ProxyResolver> get_proxy_resolver(), g_socket_client_get_proxy_resolver, refreturn) _WRAP_METHOD(Glib::RefPtr<const ProxyResolver> get_proxy_resolver() const, g_socket_client_get_proxy_resolver, refreturn, constversion) @@ -155,7 +162,6 @@ public: _WRAP_METHOD(void add_application_proxy(const Glib::ustring& protocol), g_socket_client_add_application_proxy) - _WRAP_PROPERTY("family", SocketFamily) _WRAP_PROPERTY("local-address", Glib::RefPtr<SocketAddress>) _WRAP_PROPERTY("protocol", Socket::Protocol) @@ -163,7 +169,10 @@ public: _WRAP_PROPERTY("timeout", guint) _WRAP_PROPERTY("enable-proxy", bool) _WRAP_PROPERTY("tls", bool) + //TODO: Deprecate in glibmm 2.72. _WRAP_PROPERTY("tls-validation-flags", TlsCertificateFlags) + //_WRAP_PROPERTY("tls-validation-flags", TlsCertificateFlags, + // deprecated "Do not attempt to ignore validation errors.") _WRAP_PROPERTY("proxy-resolver", Glib::RefPtr<ProxyResolver>) #m4 _CONVERSION(`GSocketConnectable*',`const Glib::RefPtr<SocketConnectable>&',`Glib::wrap($3, true)') diff --git a/gio/src/tlsclientconnection.ccg b/gio/src/tlsclientconnection.ccg index 0fb8fbb0..d6f1f633 100644 --- a/gio/src/tlsclientconnection.ccg +++ b/gio/src/tlsclientconnection.ccg @@ -17,3 +17,20 @@ #include <gio/gio.h> #include <giomm/socketconnectable.h> #include <giomm/tlsclientconnectionimpl.h> + +namespace Gio +{ +//TODO: Deprecate in glibmm 2.72. +G_GNUC_BEGIN_IGNORE_DEPRECATIONS +void TlsClientConnection::set_validation_flags(TlsCertificateFlags flags) +{ + g_tls_client_connection_set_validation_flags(gobj(), static_cast<GTlsCertificateFlags>(flags)); +} + +TlsCertificateFlags TlsClientConnection::get_validation_flags() const +{ + return static_cast<TlsCertificateFlags>(g_tls_client_connection_get_validation_flags(const_cast<GTlsClientConnection*>(gobj()))); +} +G_GNUC_END_IGNORE_DEPRECATIONS + +} // namespace Gio diff --git a/gio/src/tlsclientconnection.hg b/gio/src/tlsclientconnection.hg index d413f346..194a7301 100644 --- a/gio/src/tlsclientconnection.hg +++ b/gio/src/tlsclientconnection.hg @@ -61,8 +61,16 @@ public: _WRAP_METHOD(Glib::RefPtr<SocketConnectable> get_server_identity(), g_tls_client_connection_get_server_identity, refreturn) _WRAP_METHOD(Glib::RefPtr<const SocketConnectable> get_server_identity() const, g_tls_client_connection_get_server_identity, constversion) - _WRAP_METHOD(void set_validation_flags(TlsCertificateFlags flags), g_tls_client_connection_set_validation_flags) - _WRAP_METHOD(TlsCertificateFlags get_validation_flags() const, g_tls_client_connection_get_validation_flags) + //TODO: Deprecate in glibmm 2.72. + _WRAP_METHOD_DOCS_ONLY(g_tls_client_connection_set_validation_flags) + void set_validation_flags(TlsCertificateFlags flags); + _WRAP_METHOD_DOCS_ONLY(g_tls_client_connection_get_validation_flags) + TlsCertificateFlags get_validation_flags() const; + _IGNORE(g_tls_client_connection_set_validation_flags, g_tls_client_connection_get_validation_flags) + //_WRAP_METHOD(void set_validation_flags(TlsCertificateFlags flags), g_tls_client_connection_set_validation_flags, + // deprecated "Do not attempt to ignore validation errors.") + //_WRAP_METHOD(TlsCertificateFlags get_validation_flags() const, g_tls_client_connection_get_validation_flags, + // deprecated "Do not attempt to ignore validation errors.") _IGNORE(g_tls_client_connection_set_use_ssl3, g_tls_client_connection_get_use_ssl3) dnl// deprecated @@ -78,7 +86,10 @@ public: // specialization is added. Workaround: Use get_accepted_cas(). //_WRAP_PROPERTY("accepted-cas", std::vector<Glib::RefPtr<Glib::ByteArray>>) _WRAP_PROPERTY("server-identity", Glib::RefPtr<SocketConnectable>) + //TODO: Deprecate in glibmm 2.72. _WRAP_PROPERTY("validation-flags", TlsCertificateFlags) + //_WRAP_PROPERTY("validation-flags", TlsCertificateFlags, + // deprecated "Do not attempt to ignore validation errors.") _IGNORE_PROPERTY(use-ssl3) dnl// deprecated }; |