[glibmm] Gio::TlsConnection: Remove rehandshake API



commit cefc4a2fad7b78dce73a59030b3c709e25b6fc14
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Dec 6 13:23:02 2018 +0100

    Gio::TlsConnection: Remove rehandshake API
    
    * gio/src/tlsconnection.hg: Remove set/get/property_rehandshake_mode()
    and enum Gio::TlsRehandshakeMode. Their equivalents in glib have been
    deprecated.
    * tools/m4/convert_gio.m4: Remove conversions for GTlsRehandshakeMode.

 gio/src/tlsconnection.hg | 11 +++--------
 tools/m4/convert_gio.m4  |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index 8206c1f3..5c923b36 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -26,8 +26,6 @@ _PINCLUDE(giomm/private/iostream_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(TlsRehandshakeMode,GTlsRehandshakeMode)
-
 class Cancellable;
 class TlsDatabase;
 class TlsInteraction;
@@ -60,10 +58,8 @@ public:
   _WRAP_METHOD(void set_require_close_notify(bool require_close_notify = true), 
g_tls_connection_set_require_close_notify)
   _WRAP_METHOD(bool get_require_close_notify() const, g_tls_connection_get_require_close_notify)
 
-  _WRAP_METHOD(void set_rehandshake_mode(TlsRehandshakeMode mode), g_tls_connection_set_rehandshake_mode)
-  _WRAP_METHOD(TlsRehandshakeMode get_rehandshake_mode() const, g_tls_connection_get_rehandshake_mode)
-
-  _IGNORE(g_tls_connection_set_use_system_certdb, g_tls_connection_get_use_system_certdb)
+  _IGNORE(g_tls_connection_set_use_system_certdb, g_tls_connection_get_use_system_certdb)dnl // deprecated
+  _IGNORE(g_tls_connection_set_rehandshake_mode, g_tls_connection_get_rehandshake_mode)dnl // deprecated
 
   _WRAP_METHOD(Glib::RefPtr<TlsDatabase> get_database(), g_tls_connection_get_database)
   _WRAP_METHOD(Glib::RefPtr<const TlsDatabase> get_database() const, g_tls_connection_get_database, 
constversion)
@@ -88,9 +84,8 @@ public:
   _WRAP_PROPERTY("interaction", Glib::RefPtr<TlsInteraction>)
   _WRAP_PROPERTY("peer-certificate", Glib::RefPtr<TlsCertificate>)
   _WRAP_PROPERTY("peer-certificate-errors", TlsCertificateFlags)
-  _WRAP_PROPERTY("rehandshake-mode", TlsRehandshakeMode)
   _WRAP_PROPERTY("require-close-notify", bool)
-  _IGNORE_PROPERTY("use-system-certdb")
+  _IGNORE_PROPERTY("use-system-certdb", "rehandshake-mode")dnl // deprecated
 
 #m4 _CONVERSION(`GTlsCertificate*',`const Glib::RefPtr<const TlsCertificate>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(bool accept_certificate(const Glib::RefPtr<const TlsCertificate>& peer_cert, 
TlsCertificateFlags errors), "accept_certificate")
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index e4d03d96..a6254b66 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -78,7 +78,6 @@ _CONV_GIO_INCLASS_ENUM(TlsDatabase,VerifyFlags)
 _CONV_GIO_INCLASS_ENUM(TlsDatabase,LookupFlags)
 _CONV_GIO_ENUM(TlsInteractionResult)
 _CONV_GIO_INCLASS_ENUM(TlsPassword,Flags)
-_CONV_GIO_ENUM(TlsRehandshakeMode)
 _CONV_GIO_INCLASS_ENUM(UnixSocketAddress,Type)
 _CONV_GIO_ENUM(ZlibCompressorFormat)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]