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/giomm.h | |
| 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/giomm.h')
| -rw-r--r-- | gio/giomm.h | 7 |
1 files changed, 0 insertions, 7 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> |