diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 17:08:44 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 17:08:44 +0100 |
| commit | b22e19becc7a2640c7fa025dc2c7a3e6dd01227e (patch) | |
| tree | 6b9f560caed7cb59638581428324165a8ebba37b | |
| parent | c3b4d677a2ce7bdb932aa35d348cef260ae96d0d (diff) | |
| parent | e5e061e1c5b0ecbc1457a5792f7de017b3e1a431 (diff) | |
Merge branch 'master' into next
Conflicts:
telepathy-glib/base-connection.c
telepathy-glib/base-connection.h
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | telepathy-glib/defs.h | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -25,6 +25,8 @@ Deprecations: • TP_ERRORS has officially been deprecated since 0.11; it now produces deprecation warnings too. +• Reimplementation of the RequestHandles method is deprecated. + Enhancements: • <telepathy-glib/telepathy-glib.h> now includes all non-generated code diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h index 7e6af8b47..df0405905 100644 --- a/telepathy-glib/defs.h +++ b/telepathy-glib/defs.h @@ -109,6 +109,14 @@ G_BEGIN_DECLS # define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */ #endif +#if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE +# define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED +# define _TP_DEPRECATED_IN_UNRELEASED_FOR(f) _TP_DEPRECATED_FOR(f) +#else +# define _TP_DEPRECATED_IN_UNRELEASED /* nothing */ +# define _TP_DEPRECATED_IN_UNRELEASED_FOR(f) /* nothing */ +#endif + #if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_16 # define _TP_AVAILABLE_IN_0_16 _TP_UNAVAILABLE(0, 16) #else |