[glibmm] giomm: Temporarily remove the Tls* related API.



commit 45511d8e0ffdda76d792174569535a8b7f326d93
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Wed Mar 27 15:40:19 2013 -0400

    giomm: Temporarily remove the Tls* related API.
    
        Temporarily remove the API until after the coming stable release so
        the API can be better developed thus avoiding the risk of needing an
        API or ABI break later.
    
        * gio/src/filelist.am: Remove the tls*.hg files from the build.  This
        will keep the sources from being built and included in the upcoming
        tarball release.
        * gio/giomm.h: #if out the tls*.h includes.
        * gio/src/enums.hg: Comment out the TlsAuthenticationMode enum.
        * gio/src/error.hg: Comment out the TlsError GError.

 ChangeLog           |   15 +++++++++++++++
 gio/giomm.h         |    7 +++++++
 gio/src/enums.hg    |    7 ++++++-
 gio/src/error.hg    |    5 ++++-
 gio/src/filelist.am |   11 ++++-------
 5 files changed, 36 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b3dcf72..3cdec8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2013-03-27  José Alburquerque  <jaalburquerque gmail com>
 
+       giomm: Temporarily remove the Tls* related API.
+
+       Temporarily remove the API until after the coming stable release so
+       the API can be better developed thus avoiding the risk of needing an
+       API or ABI break later.
+
+       * gio/src/filelist.am: Remove the tls*.hg files from the build.  This
+       will keep the sources from being built and included in the upcoming
+       tarball release.
+       * gio/giomm.h: #if out the tls*.h includes.
+       * gio/src/enums.hg: Comment out the TlsAuthenticationMode enum.
+       * gio/src/error.hg: Comment out the TlsError GError.
+
+2013-03-27  José Alburquerque  <jaalburquerque gmail com>
+
        Gio::Tls*: Correct some referencing errors.
 
        * gio/src/tlscertificate.hg (get_issuer):
diff --git a/gio/giomm.h b/gio/giomm.h
index 2ce4935..b1fdea7 100644
--- a/gio/giomm.h
+++ b/gio/giomm.h
@@ -127,6 +127,11 @@
 #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>
@@ -134,6 +139,8 @@
 #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 2518559..25e4bd0 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -29,7 +29,12 @@ _WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE)
 _WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, NO_GTYPE)
 _WRAP_ENUM(ErrorEnum, GIOErrorEnum, NO_GTYPE)
 _WRAP_ENUM(SocketFamily, GSocketFamily)
-_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode)
+
+//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(TlsCertificateFlags, GTlsCertificateFlags)
 
 } // namespace Gio
diff --git a/gio/src/error.hg b/gio/src/error.hg
index 5369fa4..20bf47a 100644
--- a/gio/src/error.hg
+++ b/gio/src/error.hg
@@ -43,7 +43,10 @@ namespace Gio
  */
 _WRAP_GERROR(Error, GIOErrorEnum, G_IO_ERROR, NO_GTYPE)
 _WRAP_GERROR(ResolverError, GResolverError, G_RESOLVER_ERROR, NO_GTYPE)
-_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF$#ENDOFFILE#)
+
+//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#)
 
 } // namespace Gio
 
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index 28f7782..7b046f7 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -12,6 +12,10 @@ 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                  \
@@ -113,13 +117,6 @@ 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             \


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