diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /libnm-core/nm-version.h | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'libnm-core/nm-version.h')
| -rw-r--r-- | libnm-core/nm-version.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 3fd2f346..195fc196 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -215,24 +215,18 @@ # define NM_AVAILABLE_IN_1_22 #endif -#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_22_2 -# define NM_DEPRECATED_IN_1_22_2 G_DEPRECATED -# define NM_DEPRECATED_IN_1_22_2_FOR(f) G_DEPRECATED_FOR(f) +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_24 +# define NM_DEPRECATED_IN_1_24 G_DEPRECATED +# define NM_DEPRECATED_IN_1_24_FOR(f) G_DEPRECATED_FOR(f) #else -# define NM_DEPRECATED_IN_1_22_2 -# define NM_DEPRECATED_IN_1_22_2_FOR(f) +# define NM_DEPRECATED_IN_1_24 +# define NM_DEPRECATED_IN_1_24_FOR(f) #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22_2 -# define NM_AVAILABLE_IN_1_22_2 G_UNAVAILABLE(1,22.2) +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_24 +# define NM_AVAILABLE_IN_1_24 G_UNAVAILABLE(1,24) #else -# define NM_AVAILABLE_IN_1_22_2 -#endif - -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22_8 -# define NM_AVAILABLE_IN_1_22_8 G_UNAVAILABLE(1,22.8) -#else -# define NM_AVAILABLE_IN_1_22_8 +# define NM_AVAILABLE_IN_1_24 #endif /* @@ -255,10 +249,11 @@ * around g_dbus_connection_call_sync(). You may call it directly * without feeling dirty. * - * We don't want to force users away from this API, for that reason the - * macro does not yet expand to G_DEPRECATED. + * The API is marked as deprecated since 1.22, however the macro only starts + * complaining in 1.24. That's intentional, because in 1.22 the asynchronous + * alternative was not yet available. */ -#define _NM_DEPRECATED_SYNC_METHOD /*NM_DEPRECATED_IN_1_22*/ -#define _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY /*NM_DEPRECATED_IN_1_22*/ +#define _NM_DEPRECATED_SYNC_METHOD NM_DEPRECATED_IN_1_24 +#define _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY /* NM_DEPRECATED_IN_1_22 */ #endif /* NM_VERSION_H */ |