summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2018-03-20 20:15:09 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2018-03-20 20:15:09 +0100
commit2175551d8a12a8b9e8a68d84058e43d1b336fc42 (patch)
tree39b31b3445056c3b53aaa2941ff32e4360971fe3
parent273ea597a36b74f58099c2ed872f792c0d9ab37a (diff)
downloadglibmm-2175551d8a12a8b9e8a68d84058e43d1b336fc42.tar.gz
Gio::TlsClientConnection: Deprecate set/get/property_use_ssl3()
The corresponding glib functions have been deprecated.
-rw-r--r--gio/src/tlsclientconnection.hg15
1 files changed, 5 insertions, 10 deletions
diff --git a/gio/src/tlsclientconnection.hg b/gio/src/tlsclientconnection.hg
index 5c5ba9d9..c1e338f7 100644
--- a/gio/src/tlsclientconnection.hg
+++ b/gio/src/tlsclientconnection.hg
@@ -22,13 +22,6 @@ _DEFS(giomm,gio)
_PINCLUDE(glibmm/private/interface_p.h)
_PINCLUDE(gio/gio.h)
-//TODO: When we can deprecate API in the glibmm-2.4 ABI, deprecate set/get/property_use_sll3()
-// and remove the following 4 lines.
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
#ifndef DOXYGEN_SHOULD_SKIP_THIS
typedef struct _GTlsClientConnectionInterface GTlsClientConnectionInterface;
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
@@ -64,8 +57,10 @@ public:
_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)
- _WRAP_METHOD(void set_use_ssl3(bool use_ssl3 = true), g_tls_client_connection_set_use_ssl3)
- _WRAP_METHOD(bool get_use_ssl3() const, g_tls_client_connection_get_use_ssl3)
+ _WRAP_METHOD(void set_use_ssl3(bool use_ssl3 = true), g_tls_client_connection_set_use_ssl3,
+ deprecated "SSL 3.0 is insecure, and this function does not generally enable or disable it, despite its name.")
+ _WRAP_METHOD(bool get_use_ssl3() const, g_tls_client_connection_get_use_ssl3,
+ deprecated "SSL 3.0 is insecure, and this function does not actually indicate whether it is enabled.")
#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Glib::ByteArray> >',`Glib::ListHandler< Glib::RefPtr<Glib::ByteArray> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(std::vector< Glib::RefPtr<Glib::ByteArray> > get_accepted_cas(), g_tls_client_connection_get_accepted_cas)
@@ -78,7 +73,7 @@ public:
_WRAP_PROPERTY("accepted-cas", std::vector< Glib::RefPtr<Glib::ByteArray> >)
_WRAP_PROPERTY("server-identity", Glib::RefPtr<SocketConnectable>)
- _WRAP_PROPERTY("use-ssl3", bool)
+ _WRAP_PROPERTY("use-ssl3", bool, deprecated "SSL 3.0 is insecure, and this property does not generally enable or disable it, despite its name.")
_WRAP_PROPERTY("validation-flags", TlsCertificateFlags)
};