diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-06-13 16:32:09 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-06-13 16:32:09 +0200 |
| commit | a463062b533fe3ac0c86858832fe87d8662d5ea6 (patch) | |
| tree | 1580316c0069d47432acccfa1e17e804cb1fcbb3 /gio/src/tlsconnection.hg | |
| parent | 99d79453da0630cf2eb205658bdeef0131b1026f (diff) | |
| download | glibmm-a463062b533fe3ac0c86858832fe87d8662d5ea6.tar.gz | |
Deprecate API which is deprecated in glib
* gio/src/application.hg: Deprecate set_action_group().
* gio/src/desktopappinfo.hg: Deprecate set_desktop_env().
* gio/src/settings.[hg|ccg]: Deprecate list_schemas(), range_check() and
property_schema().
* gio/src/simpleactiongroup.hg: Define GLIB_DISABLE_DEPRECATION_WARNINGS
in the .cc file.
* gio/src/tlsconnection.hg: Deprecate [set|get]_use_system_certdb()
and property_use_system_certdb().
* gio/src/volumemonitor.hg: Deprecate adopt_orphan_mount() also in
the .cc file.
* glib/glibmm/filelist.am: Build only the glibmm_files_used.
* glib/src/filelist.am: Add glibmm_files_deprecated_hg. Move thread.hg
and valuearray.hg to it.
* glib/src/keyfile.hg: Deprecate one of the load_from_dirs() methods
also in the .cc file.
* glib/src/valuearray.hg: Deprecate the whole class Glib::ValueArray.
* tests/glibmm_valuearray/main.cc: Undefine GLIBMM_DISABLE_DEPRECATED.
Diffstat (limited to 'gio/src/tlsconnection.hg')
| -rw-r--r-- | gio/src/tlsconnection.hg | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg index 69ff7246..bc753d3a 100644 --- a/gio/src/tlsconnection.hg +++ b/gio/src/tlsconnection.hg @@ -15,6 +15,8 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +_CONFIGINCLUDE(giommconfig.h) + #include <giomm/iostream.h> #include <giomm/tlscertificate.h> #include <giomm/asyncresult.h> @@ -22,6 +24,11 @@ _DEFS(giomm,gio) _PINCLUDE(giomm/private/iostream_p.h) +#m4 _PUSH(SECTION_CC_PRE_INCLUDES) +#undef G_DISABLE_DEPRECATED +#define GLIB_DISABLE_DEPRECATION_WARNINGS 1 +#m4 _POP() + namespace Gio { @@ -62,8 +69,10 @@ public: _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) - _WRAP_METHOD(void set_use_system_certdb(bool use_system_certdb = true), g_tls_connection_set_use_system_certdb) - _WRAP_METHOD(bool get_use_system_certdb() const, g_tls_connection_get_use_system_certdb) + _WRAP_METHOD(void set_use_system_certdb(bool use_system_certdb = true), g_tls_connection_set_use_system_certdb, + deprecated "Use set_database() instead.") + _WRAP_METHOD(bool get_use_system_certdb() const, g_tls_connection_get_use_system_certdb, + deprecated "Use get_database() instead.") _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) @@ -90,7 +99,7 @@ public: _WRAP_PROPERTY("peer-certificate-errors", TlsCertificateFlags) _WRAP_PROPERTY("rehandshake-mode", TlsRehandshakeMode) _WRAP_PROPERTY("require-close-notify", bool) - _WRAP_PROPERTY("use-system-certdb", bool) + _WRAP_PROPERTY("use-system-certdb", bool, deprecated "Use property_database() instead.") #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") |