diff options
Diffstat (limited to 'src/libnm-core-public')
| -rw-r--r-- | src/libnm-core-public/meson.build | 1 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-core-types.h | 1 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-dbus-interface.h | 4 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-dbus-types.xml | 4 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-errors.h | 24 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-bond-port.h | 2 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-bond.h | 3 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-connection.h | 4 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-gsm.h | 32 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-ip-config.h | 2 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-ip6-config.h | 4 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-link.h | 52 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-wireless.h | 9 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting.h | 3 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-version-macros.h | 7 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-version-macros.h.in | 3 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-version.h | 19 |
17 files changed, 127 insertions, 47 deletions
diff --git a/src/libnm-core-public/meson.build b/src/libnm-core-public/meson.build index c5407130..d135dbff 100644 --- a/src/libnm-core-public/meson.build +++ b/src/libnm-core-public/meson.build @@ -29,6 +29,7 @@ libnm_core_headers = files( 'nm-setting-ip-tunnel.h', 'nm-setting-ip4-config.h', 'nm-setting-ip6-config.h', + 'nm-setting-link.h', 'nm-setting-loopback.h', 'nm-setting-macsec.h', 'nm-setting-macvlan.h', diff --git a/src/libnm-core-public/nm-core-types.h b/src/libnm-core-public/nm-core-types.h index f285a0f6..758733a1 100644 --- a/src/libnm-core-public/nm-core-types.h +++ b/src/libnm-core-public/nm-core-types.h @@ -35,6 +35,7 @@ typedef struct _NMSettingIP6Config NMSettingIP6Config; typedef struct _NMSettingIPConfig NMSettingIPConfig; typedef struct _NMSettingIPTunnel NMSettingIPTunnel; typedef struct _NMSettingInfiniband NMSettingInfiniband; +typedef struct _NMSettingLink NMSettingLink; typedef struct _NMSettingLoopback NMSettingLoopback; typedef struct _NMSettingMacsec NMSettingMacsec; typedef struct _NMSettingMacvlan NMSettingMacvlan; diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index 9f64f75f..b490e3b1 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h @@ -447,7 +447,7 @@ typedef enum /*< flags >*/ { * @NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: modem supports at least one of GSM, * GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability * @NM_DEVICE_MODEM_CAPABILITY_LTE: modem has LTE data capability - * @NM_DEVICE_MODEM_CAPABILITY_5GNR: modem has 5GNR data capability (Since: 1.36) + * @NM_DEVICE_MODEM_CAPABILITY_5GNR: modem has 5GNR data capability. Since: 1.36. * * #NMDeviceModemCapabilities values indicate the generic radio access * technology families a modem device supports. For more information on the @@ -986,7 +986,7 @@ typedef enum { * * The flags for CheckpointCreate call * - * Since: 1.12 (public since 1.4, g-ir since 1.12) + * Since: 1.12: Public since 1.4, g-ir since 1.12. */ typedef enum /*< flags >*/ { NM_CHECKPOINT_CREATE_FLAG_NONE = 0, diff --git a/src/libnm-core-public/nm-dbus-types.xml b/src/libnm-core-public/nm-dbus-types.xml index db5d8a8b..d5ac04b4 100644 --- a/src/libnm-core-public/nm-dbus-types.xml +++ b/src/libnm-core-public/nm-dbus-types.xml @@ -750,7 +750,7 @@ <row role="constant"> <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_5GNR</para><para></para></entry> <entry role="enum_member_value"><para>= <literal>0x00000040</literal></para><para></para></entry> - <entry role="enum_member_description"><para>modem has 5GNR data capability (Since: 1.36)</para><para></para></entry> + <entry role="enum_member_description"><para>modem has 5GNR data capability. Since: 1.36.</para><para></para></entry> </row> </tbody> </tgroup> @@ -1638,7 +1638,7 @@ <indexterm zone="NMCheckpointCreateFlags"> <primary>NMCheckpointCreateFlags</primary> </indexterm> - <para><para>The flags for CheckpointCreate call</para><para>Since: 1.12 (public since 1.4, g-ir since 1.12)</para><para></para></para> + <para><para>The flags for CheckpointCreate call</para><para>Since: 1.12: Public since 1.4, g-ir since 1.12.</para><para></para></para> <refsect3 role="enum_members"> <title>Values</title> <informaltable role="enum_members_table" pgwide="1" frame="none"> diff --git a/src/libnm-core-public/nm-errors.h b/src/libnm-core-public/nm-errors.h index 639c508e..11ce25f1 100644 --- a/src/libnm-core-public/nm-errors.h +++ b/src/libnm-core-public/nm-errors.h @@ -250,6 +250,12 @@ GQuark nm_secret_agent_error_quark(void); * @NM_SETTINGS_ERROR_UUID_EXISTS: a connection with that UUID already exists * @NM_SETTINGS_ERROR_INVALID_HOSTNAME: attempted to set an invalid hostname * @NM_SETTINGS_ERROR_INVALID_ARGUMENTS: invalid arguments + * @NM_SETTINGS_ERROR_VERSION_ID_MISMATCH: The profile's VersionId mismatched + * and the update is rejected. See the "version-id" argument to Update2() + * method. Since 1.44. + * @NM_SETTINGS_ERROR_NOT_SUPPORTED_BY_PLUGIN: the requested operation is not + * supported by the settings plugin currently in use for the specified object. + * Since: 1.44. * * Errors related to the settings/persistent configuration interface of * NetworkManager. @@ -259,14 +265,16 @@ GQuark nm_secret_agent_error_quark(void); * D-Bus errors in that namespace. */ typedef enum { - NM_SETTINGS_ERROR_FAILED = 0, /*< nick=Failed >*/ - NM_SETTINGS_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ - NM_SETTINGS_ERROR_NOT_SUPPORTED, /*< nick=NotSupported >*/ - NM_SETTINGS_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ - NM_SETTINGS_ERROR_READ_ONLY_CONNECTION, /*< nick=ReadOnlyConnection >*/ - NM_SETTINGS_ERROR_UUID_EXISTS, /*< nick=UuidExists >*/ - NM_SETTINGS_ERROR_INVALID_HOSTNAME, /*< nick=InvalidHostname >*/ - NM_SETTINGS_ERROR_INVALID_ARGUMENTS, /*< nick=InvalidArguments >*/ + NM_SETTINGS_ERROR_FAILED = 0, /*< nick=Failed >*/ + NM_SETTINGS_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ + NM_SETTINGS_ERROR_NOT_SUPPORTED, /*< nick=NotSupported >*/ + NM_SETTINGS_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ + NM_SETTINGS_ERROR_READ_ONLY_CONNECTION, /*< nick=ReadOnlyConnection >*/ + NM_SETTINGS_ERROR_UUID_EXISTS, /*< nick=UuidExists >*/ + NM_SETTINGS_ERROR_INVALID_HOSTNAME, /*< nick=InvalidHostname >*/ + NM_SETTINGS_ERROR_INVALID_ARGUMENTS, /*< nick=InvalidArguments >*/ + NM_SETTINGS_ERROR_VERSION_ID_MISMATCH, /*< nick=VersionIdMismatch >*/ + NM_SETTINGS_ERROR_NOT_SUPPORTED_BY_PLUGIN, /*< nick=NotSupportedByPlugin >*/ } NMSettingsError; GQuark nm_settings_error_quark(void); diff --git a/src/libnm-core-public/nm-setting-bond-port.h b/src/libnm-core-public/nm-setting-bond-port.h index 29b0beb0..033c59b4 100644 --- a/src/libnm-core-public/nm-setting-bond-port.h +++ b/src/libnm-core-public/nm-setting-bond-port.h @@ -42,7 +42,7 @@ NMSetting *nm_setting_bond_port_new(void); NM_AVAILABLE_IN_1_34 guint32 nm_setting_bond_port_get_queue_id(NMSettingBondPort *setting); -NM_AVAILABLE_IN_1_42_8 +NM_AVAILABLE_IN_1_44 gint32 nm_setting_bond_port_get_prio(NMSettingBondPort *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-bond.h b/src/libnm-core-public/nm-setting-bond.h index 10d703bc..7cead175 100644 --- a/src/libnm-core-public/nm-setting-bond.h +++ b/src/libnm-core-public/nm-setting-bond.h @@ -58,6 +58,9 @@ G_BEGIN_DECLS #define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB "tlb_dynamic_lb" #define NM_SETTING_BOND_OPTION_LP_INTERVAL "lp_interval" #define NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY "peer_notif_delay" +#define NM_SETTING_BOND_OPTION_ARP_MISSED_MAX "arp_missed_max" +#define NM_SETTING_BOND_OPTION_LACP_ACTIVE "lacp_active" +#define NM_SETTING_BOND_OPTION_NS_IP6_TARGET "ns_ip6_target" typedef struct _NMSettingBondClass NMSettingBondClass; diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 875307bd..42dff205 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -170,7 +170,9 @@ int nm_setting_connection_get_autoconnect_retries(NMSettingConnection *setting); NM_AVAILABLE_IN_1_14 NMConnectionMultiConnect nm_setting_connection_get_multi_connect(NMSettingConnection *setting); guint64 nm_setting_connection_get_timestamp(NMSettingConnection *setting); -gboolean nm_setting_connection_get_read_only(NMSettingConnection *setting); + +NM_DEPRECATED_IN_1_44 +gboolean nm_setting_connection_get_read_only(NMSettingConnection *setting); guint32 nm_setting_connection_get_num_permissions(NMSettingConnection *setting); gboolean nm_setting_connection_get_permission(NMSettingConnection *setting, diff --git a/src/libnm-core-public/nm-setting-gsm.h b/src/libnm-core-public/nm-setting-gsm.h index 0d57511d..dd5b0b26 100644 --- a/src/libnm-core-public/nm-setting-gsm.h +++ b/src/libnm-core-public/nm-setting-gsm.h @@ -26,19 +26,21 @@ G_BEGIN_DECLS #define NM_SETTING_GSM_SETTING_NAME "gsm" -#define NM_SETTING_GSM_AUTO_CONFIG "auto-config" -#define NM_SETTING_GSM_USERNAME "username" -#define NM_SETTING_GSM_PASSWORD "password" -#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags" -#define NM_SETTING_GSM_APN "apn" -#define NM_SETTING_GSM_NETWORK_ID "network-id" -#define NM_SETTING_GSM_PIN "pin" -#define NM_SETTING_GSM_PIN_FLAGS "pin-flags" -#define NM_SETTING_GSM_HOME_ONLY "home-only" -#define NM_SETTING_GSM_DEVICE_ID "device-id" -#define NM_SETTING_GSM_SIM_ID "sim-id" -#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" -#define NM_SETTING_GSM_MTU "mtu" +#define NM_SETTING_GSM_AUTO_CONFIG "auto-config" +#define NM_SETTING_GSM_USERNAME "username" +#define NM_SETTING_GSM_PASSWORD "password" +#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags" +#define NM_SETTING_GSM_APN "apn" +#define NM_SETTING_GSM_NETWORK_ID "network-id" +#define NM_SETTING_GSM_PIN "pin" +#define NM_SETTING_GSM_PIN_FLAGS "pin-flags" +#define NM_SETTING_GSM_HOME_ONLY "home-only" +#define NM_SETTING_GSM_DEVICE_ID "device-id" +#define NM_SETTING_GSM_SIM_ID "sim-id" +#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id" +#define NM_SETTING_GSM_MTU "mtu" +#define NM_SETTING_GSM_INITIAL_EPS_BEARER_CONFIGURE "initial-eps-bearer-configure" +#define NM_SETTING_GSM_INITIAL_EPS_BEARER_APN "initial-eps-bearer-apn" /* Deprecated */ #define NM_SETTING_GSM_NUMBER "number" @@ -67,6 +69,10 @@ NM_AVAILABLE_IN_1_2 const char *nm_setting_gsm_get_sim_operator_id(NMSettingGsm *setting); NM_AVAILABLE_IN_1_8 guint32 nm_setting_gsm_get_mtu(NMSettingGsm *setting); +NM_AVAILABLE_IN_1_44 +gboolean nm_setting_gsm_get_initial_eps_config(NMSettingGsm *setting); +NM_AVAILABLE_IN_1_44 +const char *nm_setting_gsm_get_initial_eps_apn(NMSettingGsm *setting); NM_DEPRECATED_IN_1_16 const char *nm_setting_gsm_get_number(NMSettingGsm *setting); diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index 7e1d3889..f7281965 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -501,7 +501,7 @@ NM_AVAILABLE_IN_1_28 void nm_setting_ip_config_clear_dhcp_reject_servers(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_42 NMTernary nm_setting_ip_config_get_auto_route_ext_gw(NMSettingIPConfig *setting); -NM_AVAILABLE_IN_1_42_2 +NM_AVAILABLE_IN_1_44 NMTernary nm_setting_ip_config_get_replace_local_rule(NMSettingIPConfig *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-ip6-config.h b/src/libnm-core-public/nm-setting-ip6-config.h index 5abc173d..0403cdf8 100644 --- a/src/libnm-core-public/nm-setting-ip6-config.h +++ b/src/libnm-core-public/nm-setting-ip6-config.h @@ -40,6 +40,8 @@ G_BEGIN_DECLS #define NM_SETTING_IP6_CONFIG_MTU "mtu" +#define NM_SETTING_IP6_CONFIG_DHCP_PD_HINT "dhcp-pd-hint" + /** * NM_SETTING_IP6_CONFIG_METHOD_IGNORE: * @@ -164,6 +166,8 @@ NM_AVAILABLE_IN_1_24 gint32 nm_setting_ip6_config_get_ra_timeout(NMSettingIP6Config *setting); NM_AVAILABLE_IN_1_40 guint32 nm_setting_ip6_config_get_mtu(NMSettingIP6Config *setting); +NM_AVAILABLE_IN_1_44 +const char *nm_setting_ip6_config_get_dhcp_pd_hint(NMSettingIP6Config *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-link.h b/src/libnm-core-public/nm-setting-link.h new file mode 100644 index 00000000..98973ff5 --- /dev/null +++ b/src/libnm-core-public/nm-setting-link.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2020 Red Hat, Inc. + */ + +#ifndef __NM_SETTING_LINK_H__ +#define __NM_SETTING_LINK_H__ + +#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION) +#error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-setting.h" + +G_BEGIN_DECLS + +#define NM_TYPE_SETTING_LINK (nm_setting_link_get_type()) +#define NM_SETTING_LINK(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_LINK, NMSettingLink)) +#define NM_SETTING_LINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_LINK, NMSettingLinkClass)) +#define NM_IS_SETTING_LINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_LINK)) +#define NM_IS_SETTING_LINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_LINK)) +#define NM_SETTING_LINK_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_LINK, NMSettingLinkClass)) + +#define NM_SETTING_LINK_SETTING_NAME "link" + +#define NM_SETTING_LINK_TX_QUEUE_LENGTH "tx-queue-length" +#define NM_SETTING_LINK_GSO_MAX_SIZE "gso-max-size" +#define NM_SETTING_LINK_GSO_MAX_SEGMENTS "gso-max-segments" +#define NM_SETTING_LINK_GRO_MAX_SIZE "gro-max-size" + +typedef struct _NMSettingLinkClass NMSettingLinkClass; + +NM_AVAILABLE_IN_1_44 +GType nm_setting_link_get_type(void); +NM_AVAILABLE_IN_1_44 +NMSetting *nm_setting_link_new(void); + +NM_AVAILABLE_IN_1_44 +gint64 nm_setting_link_get_tx_queue_length(NMSettingLink *setting); +NM_AVAILABLE_IN_1_44 +gint64 nm_setting_link_get_gso_max_size(NMSettingLink *setting); +NM_AVAILABLE_IN_1_44 +gint64 nm_setting_link_get_gso_max_segments(NMSettingLink *setting); +NM_AVAILABLE_IN_1_44 +gint64 nm_setting_link_get_gro_max_size(NMSettingLink *setting); + +G_END_DECLS + +#endif /* __NM_SETTING_LINK_H__ */ diff --git a/src/libnm-core-public/nm-setting-wireless.h b/src/libnm-core-public/nm-setting-wireless.h index bb158112..5f8d09c5 100644 --- a/src/libnm-core-public/nm-setting-wireless.h +++ b/src/libnm-core-public/nm-setting-wireless.h @@ -155,8 +155,13 @@ const char *nm_setting_wireless_get_mode(NMSettingWireless *setting); const char *nm_setting_wireless_get_band(NMSettingWireless *setting); guint32 nm_setting_wireless_get_channel(NMSettingWireless *setting); const char *nm_setting_wireless_get_bssid(NMSettingWireless *setting); -guint32 nm_setting_wireless_get_rate(NMSettingWireless *setting); -guint32 nm_setting_wireless_get_tx_power(NMSettingWireless *setting); + +NM_DEPRECATED_IN_1_44 +guint32 nm_setting_wireless_get_rate(NMSettingWireless *setting); + +NM_DEPRECATED_IN_1_44 +guint32 nm_setting_wireless_get_tx_power(NMSettingWireless *setting); + const char *nm_setting_wireless_get_mac_address(NMSettingWireless *setting); const char *nm_setting_wireless_get_cloned_mac_address(NMSettingWireless *setting); diff --git a/src/libnm-core-public/nm-setting.h b/src/libnm-core-public/nm-setting.h index 737cf883..d525a6ad 100644 --- a/src/libnm-core-public/nm-setting.h +++ b/src/libnm-core-public/nm-setting.h @@ -164,9 +164,6 @@ typedef void (*NMSettingValueIterFn)(NMSetting *setting, GParamFlags flags, gpointer user_data); -/*< private >*/ -typedef gboolean (*_NMConnectionForEachSecretFunc)(NMSettingSecretFlags flags, gpointer user_data); - typedef struct _NMSettingClass NMSettingClass; GType nm_setting_get_type(void); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index 40c89169..9b5233e4 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -22,7 +22,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (42) +#define NM_MINOR_VERSION (44) /** * NM_MICRO_VERSION: @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (8) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: @@ -72,8 +72,7 @@ #define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0)) #define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0)) -#define NM_VERSION_1_42_2 (NM_ENCODE_VERSION(1, 42, 2)) -#define NM_VERSION_1_42_8 (NM_ENCODE_VERSION(1, 42, 8)) +#define NM_VERSION_1_44 (NM_ENCODE_VERSION(1, 44, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in index 711b9e19..f44199a0 100644 --- a/src/libnm-core-public/nm-version-macros.h.in +++ b/src/libnm-core-public/nm-version-macros.h.in @@ -72,8 +72,7 @@ #define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0)) #define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0)) -#define NM_VERSION_1_42_2 (NM_ENCODE_VERSION(1, 42, 2)) -#define NM_VERSION_1_42_8 (NM_ENCODE_VERSION(1, 42, 8)) +#define NM_VERSION_1_44 (NM_ENCODE_VERSION(1, 44, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h index b963671c..271535d2 100644 --- a/src/libnm-core-public/nm-version.h +++ b/src/libnm-core-public/nm-version.h @@ -355,16 +355,18 @@ #define NM_AVAILABLE_IN_1_42 #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_42_2 -#define NM_AVAILABLE_IN_1_42_2 G_UNAVAILABLE(1, 42.2) +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_44 +#define NM_DEPRECATED_IN_1_44 G_DEPRECATED +#define NM_DEPRECATED_IN_1_44_FOR(f) G_DEPRECATED_FOR(f) #else -#define NM_AVAILABLE_IN_1_42_2 +#define NM_DEPRECATED_IN_1_44 +#define NM_DEPRECATED_IN_1_44_FOR(f) #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_42_8 -#define NM_AVAILABLE_IN_1_42_8 G_UNAVAILABLE(1, 42.8) +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_44 +#define NM_AVAILABLE_IN_1_44 G_UNAVAILABLE(1, 44) #else -#define NM_AVAILABLE_IN_1_42_8 +#define NM_AVAILABLE_IN_1_44 #endif /* @@ -391,7 +393,8 @@ * 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_24 -#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 */ +#define _NM_DEPRECATED_INCLUSIVE_LANGUAGE_1_44 /* NM_DEPRECATED_IN_1_44 */ #endif /* NM_VERSION_H */ |