diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2013-04-01 18:10:15 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2013-04-01 18:10:15 +0200 |
| commit | 176fe447e82ba1abdc3febb19c235c8d7a466fe7 (patch) | |
| tree | 4c008c6130cc19c8d1b11bd38755386735167ba0 /gio | |
| parent | dfd720d612abc216c09308ab820cb7896189e1b1 (diff) | |
| download | glibmm-176fe447e82ba1abdc3febb19c235c8d7a466fe7.tar.gz | |
Revert "giomm: Temporarily remove the Tls* related API."
This reverts commit 45511d8e0ffdda76d792174569535a8b7f326d93.
We will now try to get this right for the glibmm 3.7/8 releases.
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/giomm.h | 7 | ||||
| -rw-r--r-- | gio/src/enums.hg | 7 | ||||
| -rw-r--r-- | gio/src/error.hg | 5 | ||||
| -rw-r--r-- | gio/src/filelist.am | 11 |
4 files changed, 9 insertions, 21 deletions
diff --git a/gio/giomm.h b/gio/giomm.h index b1fdea79..2ce4935f 100644 --- a/gio/giomm.h +++ b/gio/giomm.h @@ -127,11 +127,6 @@ #include <giomm/tcpconnection.h> #include <giomm/themedicon.h> #include <giomm/threadedsocketservice.h> - -//TODO: Re-add these includes after the next stable release when the -//development of these classes can continue without risking needing an API or -//ABI break later. -#if 0 #include <giomm/tlscertificate.h> #include <giomm/tlsclientconnection.h> #include <giomm/tlsconnection.h> @@ -139,8 +134,6 @@ #include <giomm/tlsinteraction.h> #include <giomm/tlspassword.h> #include <giomm/tlsserverconnection.h> -#endif - #ifndef G_OS_WIN32 # include <giomm/unixconnection.h> # include <giomm/unixcredentialsmessage.h> diff --git a/gio/src/enums.hg b/gio/src/enums.hg index 25e4bd0b..25185596 100644 --- a/gio/src/enums.hg +++ b/gio/src/enums.hg @@ -29,12 +29,7 @@ _WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE) _WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, NO_GTYPE) _WRAP_ENUM(ErrorEnum, GIOErrorEnum, NO_GTYPE) _WRAP_ENUM(SocketFamily, GSocketFamily) - -//TODO: Re-add after the next stable release (2.36) when development of its -//related classes can continue safely. -//_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode) - -// This one is needed by SocketClient (not removed). +_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode) _WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags) } // namespace Gio diff --git a/gio/src/error.hg b/gio/src/error.hg index 20bf47a9..5369fa47 100644 --- a/gio/src/error.hg +++ b/gio/src/error.hg @@ -43,10 +43,7 @@ namespace Gio */ _WRAP_GERROR(Error, GIOErrorEnum, G_IO_ERROR, NO_GTYPE) _WRAP_GERROR(ResolverError, GResolverError, G_RESOLVER_ERROR, NO_GTYPE) - -//TODO: Re-add after the next stable release (2.36) when development of its -//related classes can continue safely. -//_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF$#ENDOFFILE#) +_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF$#ENDOFFILE#) } // namespace Gio diff --git a/gio/src/filelist.am b/gio/src/filelist.am index 7b046f70..28f7782a 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -12,10 +12,6 @@ giomm_files_defs = \ gio_docs.xml \ gio_docs_override.xml -# TODO: Re-add the tls*.hg files in gio/src after the stable release to -# complete their development in conjunction with the patch in bug #696671 (or -# a modification of it) if necessary. - giomm_files_any_hg = \ action.hg \ actiongroup.hg \ @@ -117,6 +113,13 @@ giomm_files_any_hg = \ tcpconnection.hg \ threadedsocketservice.hg \ themedicon.hg \ + tlscertificate.hg \ + tlsclientconnection.hg \ + tlsconnection.hg \ + tlsdatabase.hg \ + tlsinteraction.hg \ + tlspassword.hg \ + tlsserverconnection.hg \ volume.hg \ volumemonitor.hg \ zlibdecompressor.hg \ |