diff options
Diffstat (limited to 'src/libnm-core-public')
25 files changed, 68 insertions, 35 deletions
diff --git a/src/libnm-core-public/nm-connection.h b/src/libnm-core-public/nm-connection.h index 93061f25..47004ce8 100644 --- a/src/libnm-core-public/nm-connection.h +++ b/src/libnm-core-public/nm-connection.h @@ -220,12 +220,13 @@ NMSettingMacsec *nm_connection_get_setting_macsec(NMConnection *connection); NM_AVAILABLE_IN_1_2 NMSettingMacvlan *nm_connection_get_setting_macvlan(NMConnection *connection); NMSettingOlpcMesh *nm_connection_get_setting_olpc_mesh(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 NMSettingOvsBridge *nm_connection_get_setting_ovs_bridge(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 NMSettingOvsInterface *nm_connection_get_setting_ovs_interface(NMConnection *connection); -NMSettingOvsPatch *nm_connection_get_setting_ovs_patch(NMConnection *connection); -NM_AVAILABLE_IN_1_10 +NM_AVAILABLE_IN_1_14 +NMSettingOvsPatch *nm_connection_get_setting_ovs_patch(NMConnection *connection); +NM_AVAILABLE_IN_1_14 NMSettingOvsPort *nm_connection_get_setting_ovs_port(NMConnection *connection); NMSettingPpp *nm_connection_get_setting_ppp(NMConnection *connection); NMSettingPppoe *nm_connection_get_setting_pppoe(NMConnection *connection); @@ -234,7 +235,7 @@ NMSettingProxy *nm_connection_get_setting_proxy(NMConnection *connection); NMSettingSerial *nm_connection_get_setting_serial(NMConnection *connection); NM_AVAILABLE_IN_1_12 NMSettingTCConfig *nm_connection_get_setting_tc_config(NMConnection *connection); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_14 NMSettingTun *nm_connection_get_setting_tun(NMConnection *connection); NMSettingVpn *nm_connection_get_setting_vpn(NMConnection *connection); NMSettingWimax *nm_connection_get_setting_wimax(NMConnection *connection); diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index 4557dde0..6e1a84a1 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h @@ -103,6 +103,8 @@ * The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be * used by upstream NetworkManager. It could thus be used for downstream * extensions. + * + * Since: 1.6 */ typedef enum { NM_CAPABILITY_TEAM = 1, @@ -967,7 +969,7 @@ typedef enum { * * The flags for CheckpointCreate call * - * Since: 1.4 (gi flags generated 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 cb72820d..52ac4981 100644 --- a/src/libnm-core-public/nm-dbus-types.xml +++ b/src/libnm-core-public/nm-dbus-types.xml @@ -18,7 +18,7 @@ <indexterm zone="NMCapability"> <primary>NMCapability</primary> </indexterm> - <para><para><link linkend="NMCapability">NMCapability</link> names the numbers in the Capabilities property. Capabilities are positive numbers. They are part of stable API and a certain capability number is guaranteed not to change.</para><para>The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions.</para><para></para></para> + <para><para><link linkend="NMCapability">NMCapability</link> names the numbers in the Capabilities property. Capabilities are positive numbers. They are part of stable API and a certain capability number is guaranteed not to change.</para><para>The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions.</para><para>Since: 1.6</para><para></para></para> <refsect3 role="enum_members"> <title>Values</title> <informaltable role="enum_members_table" pgwide="1" frame="none"> @@ -1613,7 +1613,7 @@ <indexterm zone="NMCheckpointCreateFlags"> <primary>NMCheckpointCreateFlags</primary> </indexterm> - <para><para>The flags for CheckpointCreate call</para><para>Since: 1.4 (gi flags generated 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-setting-6lowpan.h b/src/libnm-core-public/nm-setting-6lowpan.h index 358ccff6..ab2f7b44 100644 --- a/src/libnm-core-public/nm-setting-6lowpan.h +++ b/src/libnm-core-public/nm-setting-6lowpan.h @@ -33,10 +33,10 @@ typedef struct _NMSetting6LowpanClass NMSetting6LowpanClass; NM_AVAILABLE_IN_1_14 GType nm_setting_6lowpan_get_type(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_6lowpan_new(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_6lowpan_get_parent(NMSetting6Lowpan *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 4b6ce17c..4f6653bf 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -73,6 +73,8 @@ G_BEGIN_DECLS * * #NMSettingConnectionAutoconnectSlaves values indicate whether slave connections * should be activated when master is activated. + * + * Since: 1.2 */ typedef enum { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT = -1, @@ -87,6 +89,8 @@ typedef enum { * @NM_SETTING_CONNECTION_LLDP_ENABLE_RX: enable reception of LLDP frames * * #NMSettingConnectionLldp values indicate whether LLDP should be enabled. + * + * Since: 1.2 */ typedef enum { NM_SETTING_CONNECTION_LLDP_DEFAULT = -1, @@ -217,7 +221,7 @@ NMSettingConnectionLlmnr nm_setting_connection_get_llmnr(NMSettingConnection *se NM_AVAILABLE_IN_1_34 NMSettingConnectionDnsOverTls nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting); -NM_AVAILABLE_IN_1_40 +NM_AVAILABLE_IN_1_40_4 NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting); NM_AVAILABLE_IN_1_20 diff --git a/src/libnm-core-public/nm-setting-hostname.h b/src/libnm-core-public/nm-setting-hostname.h index f93e0efe..3fb71197 100644 --- a/src/libnm-core-public/nm-setting-hostname.h +++ b/src/libnm-core-public/nm-setting-hostname.h @@ -36,7 +36,7 @@ typedef struct _NMSettingHostnameClass NMSettingHostnameClass; NM_AVAILABLE_IN_1_30 GType nm_setting_hostname_get_type(void); -NM_AVAILABLE_IN_1_30 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_hostname_new(void); NM_AVAILABLE_IN_1_30 diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index 6283ecc9..acbdec0f 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -480,7 +480,7 @@ NM_AVAILABLE_IN_1_2 int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_34 int nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting); -NM_AVAILABLE_IN_1_22 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_22 diff --git a/src/libnm-core-public/nm-setting-ip-tunnel.h b/src/libnm-core-public/nm-setting-ip-tunnel.h index 34920099..62472f11 100644 --- a/src/libnm-core-public/nm-setting-ip-tunnel.h +++ b/src/libnm-core-public/nm-setting-ip-tunnel.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS typedef struct _NMSettingIPTunnelClass NMSettingIPTunnelClass; -/* +/** * NMIPTunnelFlags: * @NM_IP_TUNNEL_FLAG_NONE: no flag * @NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT: don't add encapsulation limit @@ -94,9 +94,9 @@ NM_AVAILABLE_IN_1_2 const char *nm_setting_ip_tunnel_get_input_key(NMSettingIPTunnel *setting); NM_AVAILABLE_IN_1_2 const char *nm_setting_ip_tunnel_get_output_key(NMSettingIPTunnel *setting); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 guint nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 guint nm_setting_ip_tunnel_get_flow_label(NMSettingIPTunnel *setting); NM_AVAILABLE_IN_1_2 guint nm_setting_ip_tunnel_get_mtu(NMSettingIPTunnel *setting); diff --git a/src/libnm-core-public/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h index 7991d682..66c457b9 100644 --- a/src/libnm-core-public/nm-setting-ip4-config.h +++ b/src/libnm-core-public/nm-setting-ip4-config.h @@ -113,7 +113,7 @@ const char *nm_setting_ip4_config_get_dhcp_fqdn(NMSettingIP4Config *setting); NM_AVAILABLE_IN_1_28 const char *nm_setting_ip4_config_get_dhcp_vendor_class_identifier(NMSettingIP4Config *setting); -NM_AVAILABLE_IN_1_40 +NM_AVAILABLE_IN_1_40_4 NMSettingIP4LinkLocal nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-macvlan.h b/src/libnm-core-public/nm-setting-macvlan.h index 88ee81e7..25c41346 100644 --- a/src/libnm-core-public/nm-setting-macvlan.h +++ b/src/libnm-core-public/nm-setting-macvlan.h @@ -42,6 +42,8 @@ typedef struct _NMSettingMacvlanClass NMSettingMacvlanClass; * @NM_SETTING_MACVLAN_MODE_PRIVATE: private mode * @NM_SETTING_MACVLAN_MODE_PASSTHRU: passthru mode * @NM_SETTING_MACVLAN_MODE_SOURCE: source mode + * + * Since: 1.2 **/ typedef enum { NM_SETTING_MACVLAN_MODE_UNKNOWN = 0, diff --git a/src/libnm-core-public/nm-setting-ovs-bridge.h b/src/libnm-core-public/nm-setting-ovs-bridge.h index 33e8dffb..bc7d7e9b 100644 --- a/src/libnm-core-public/nm-setting-ovs-bridge.h +++ b/src/libnm-core-public/nm-setting-ovs-bridge.h @@ -49,7 +49,7 @@ NM_AVAILABLE_IN_1_10 gboolean nm_setting_ovs_bridge_get_rstp_enable(NMSettingOvsBridge *self); NM_AVAILABLE_IN_1_10 gboolean nm_setting_ovs_bridge_get_stp_enable(NMSettingOvsBridge *self); -NM_AVAILABLE_IN_1_20 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_ovs_bridge_get_datapath_type(NMSettingOvsBridge *self); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting-sriov.h b/src/libnm-core-public/nm-setting-sriov.h index 93afde98..0438e800 100644 --- a/src/libnm-core-public/nm-setting-sriov.h +++ b/src/libnm-core-public/nm-setting-sriov.h @@ -109,7 +109,7 @@ NM_AVAILABLE_IN_1_14 const char **nm_sriov_vf_get_attribute_names(const NMSriovVF *vf); NM_AVAILABLE_IN_1_14 GVariant *nm_sriov_vf_get_attribute(const NMSriovVF *vf, const char *name); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 gboolean nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *known, GError **error); diff --git a/src/libnm-core-public/nm-setting-tc-config.h b/src/libnm-core-public/nm-setting-tc-config.h index abd61683..ab1a9909 100644 --- a/src/libnm-core-public/nm-setting-tc-config.h +++ b/src/libnm-core-public/nm-setting-tc-config.h @@ -102,9 +102,9 @@ NM_AVAILABLE_IN_1_12 void nm_tc_tfilter_set_handle(NMTCTfilter *tfilter, guint32 handle); NM_AVAILABLE_IN_1_12 guint32 nm_tc_tfilter_get_parent(NMTCTfilter *tfilter); -NM_AVAILABLE_IN_1_12 +NM_AVAILABLE_IN_1_40_4 NMTCAction *nm_tc_tfilter_get_action(NMTCTfilter *tfilter); -NM_AVAILABLE_IN_1_12 +NM_AVAILABLE_IN_1_40_4 void nm_tc_tfilter_set_action(NMTCTfilter *tfilter, NMTCAction *action); #define NM_TYPE_SETTING_TC_CONFIG (nm_setting_tc_config_get_type()) diff --git a/src/libnm-core-public/nm-setting-team.h b/src/libnm-core-public/nm-setting-team.h index 63df4080..2e16ee20 100644 --- a/src/libnm-core-public/nm-setting-team.h +++ b/src/libnm-core-public/nm-setting-team.h @@ -25,6 +25,8 @@ G_BEGIN_DECLS * option 'validate_inactive' is enabled (set to true). * @NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS: the arp_ping link watcher option * 'send_always' is enabled (set to true). + * + * Since: 1.12 */ typedef enum /*< flags >*/ { NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE = 0, /*< skip >*/ diff --git a/src/libnm-core-public/nm-setting-tun.h b/src/libnm-core-public/nm-setting-tun.h index 8f808410..3575c644 100644 --- a/src/libnm-core-public/nm-setting-tun.h +++ b/src/libnm-core-public/nm-setting-tun.h @@ -39,6 +39,8 @@ G_BEGIN_DECLS * @NM_SETTING_TUN_MODE_TAP: a TAP device * * #NMSettingTunMode values indicate the device type (TUN/TAP) + * + * Since: 1.2 */ typedef enum { NM_SETTING_TUN_MODE_UNKNOWN = 0, diff --git a/src/libnm-core-public/nm-setting-vpn.h b/src/libnm-core-public/nm-setting-vpn.h index 151a293a..a00fa975 100644 --- a/src/libnm-core-public/nm-setting-vpn.h +++ b/src/libnm-core-public/nm-setting-vpn.h @@ -49,7 +49,9 @@ GType nm_setting_vpn_get_type(void); NMSetting *nm_setting_vpn_new(void); const char *nm_setting_vpn_get_service_type(NMSettingVpn *setting); const char *nm_setting_vpn_get_user_name(NMSettingVpn *setting); -gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting); + +NM_AVAILABLE_IN_1_40_4 +gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting); guint32 nm_setting_vpn_get_num_data_items(NMSettingVpn *setting); void nm_setting_vpn_add_data_item(NMSettingVpn *setting, const char *key, const char *item); diff --git a/src/libnm-core-public/nm-setting-wireless-security.h b/src/libnm-core-public/nm-setting-wireless-security.h index e564204b..b9fea123 100644 --- a/src/libnm-core-public/nm-setting-wireless-security.h +++ b/src/libnm-core-public/nm-setting-wireless-security.h @@ -74,6 +74,8 @@ typedef enum { * @NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED: require PMF and fail if not available * * These flags indicate whether PMF must be enabled. + * + * Since: 1.10 **/ typedef enum { NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-setting-wireless.h b/src/libnm-core-public/nm-setting-wireless.h index 1f94060c..bb158112 100644 --- a/src/libnm-core-public/nm-setting-wireless.h +++ b/src/libnm-core-public/nm-setting-wireless.h @@ -132,6 +132,8 @@ typedef enum /*< flags >*/ { * @NM_SETTING_WIRELESS_POWERSAVE_ENABLE: enable powersave * * These flags indicate whether wireless powersave must be enabled. + * + * Since: 1.2 **/ typedef enum { NM_SETTING_WIRELESS_POWERSAVE_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-setting-wpan.h b/src/libnm-core-public/nm-setting-wpan.h index 883b77e1..934ab196 100644 --- a/src/libnm-core-public/nm-setting-wpan.h +++ b/src/libnm-core-public/nm-setting-wpan.h @@ -38,18 +38,18 @@ typedef struct _NMSettingWpanClass NMSettingWpanClass; NM_AVAILABLE_IN_1_14 GType nm_setting_wpan_get_type(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 NMSetting *nm_setting_wpan_new(void); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 const char *nm_setting_wpan_get_mac_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 guint16 nm_setting_wpan_get_pan_id(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 +NM_AVAILABLE_IN_1_40_4 guint16 nm_setting_wpan_get_short_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 +NM_AVAILABLE_IN_1_40_4 gint16 nm_setting_wpan_get_page(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 +NM_AVAILABLE_IN_1_40_4 gint16 nm_setting_wpan_get_channel(NMSettingWpan *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-setting.h b/src/libnm-core-public/nm-setting.h index ee2076c3..ae898458 100644 --- a/src/libnm-core-public/nm-setting.h +++ b/src/libnm-core-public/nm-setting.h @@ -24,15 +24,15 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING, NMSettingClass)) /* The property of the #NMSetting is required for the setting to be valid */ -#define NM_SETTING_PARAM_REQUIRED (1 << (1 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_REQUIRED 0x200 /* The property of the #NMSetting is a secret */ -#define NM_SETTING_PARAM_SECRET (1 << (2 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_SECRET 0x400 /* The property of the #NMSetting should be ignored during comparisons that * use the %NM_SETTING_COMPARE_FLAG_FUZZY flag. */ -#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT)) +#define NM_SETTING_PARAM_FUZZY_IGNORE 0x800 /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ @@ -122,6 +122,8 @@ typedef enum { * @NM_SETTING_MAC_RANDOMIZATION_ALWAYS: a random MAC address is used. * * Controls if and how the MAC address of a device is randomzied. + * + * Since: 1.2 **/ typedef enum { NM_SETTING_MAC_RANDOMIZATION_DEFAULT = 0, diff --git a/src/libnm-core-public/nm-utils.h b/src/libnm-core-public/nm-utils.h index 5faed75a..dc89f234 100644 --- a/src/libnm-core-public/nm-utils.h +++ b/src/libnm-core-public/nm-utils.h @@ -104,9 +104,13 @@ GPtrArray *nm_utils_ip6_addresses_from_variant(GVariant *value, char **out_gatew GVariant *nm_utils_ip6_routes_to_variant(GPtrArray *routes); GPtrArray *nm_utils_ip6_routes_from_variant(GVariant *value); -GVariant *nm_utils_ip_addresses_to_variant(GPtrArray *addresses); +NM_AVAILABLE_IN_1_40_4 +GVariant *nm_utils_ip_addresses_to_variant(GPtrArray *addresses); +NM_AVAILABLE_IN_1_40_4 GPtrArray *nm_utils_ip_addresses_from_variant(GVariant *value, int family); -GVariant *nm_utils_ip_routes_to_variant(GPtrArray *routes); +NM_AVAILABLE_IN_1_40_4 +GVariant *nm_utils_ip_routes_to_variant(GPtrArray *routes); +NM_AVAILABLE_IN_1_40_4 GPtrArray *nm_utils_ip_routes_from_variant(GVariant *value, int family); char *nm_utils_uuid_generate(void); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index edd872e8..4dce57f6 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: @@ -72,6 +72,7 @@ #define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0)) #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_40_4 (NM_ENCODE_VERSION (1, 40, 4)) /* 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 07e79899..fc854aef 100644 --- a/src/libnm-core-public/nm-version-macros.h.in +++ b/src/libnm-core-public/nm-version-macros.h.in @@ -72,6 +72,7 @@ #define NM_VERSION_1_36 (NM_ENCODE_VERSION (1, 36, 0)) #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_40_4 (NM_ENCODE_VERSION (1, 40, 4)) /* 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 9f6e3e78..d9f9a121 100644 --- a/src/libnm-core-public/nm-version.h +++ b/src/libnm-core-public/nm-version.h @@ -341,6 +341,12 @@ #define NM_AVAILABLE_IN_1_40 #endif +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_40_4 +#define NM_AVAILABLE_IN_1_40_4 G_UNAVAILABLE(1, 40.4) +#else +#define NM_AVAILABLE_IN_1_40_4 +#endif + /* * Synchronous API for calling D-Bus in libnm is deprecated. See * https://networkmanager.dev/docs/libnm/latest/usage.html#sync-api diff --git a/src/libnm-core-public/nm-vpn-plugin-info.h b/src/libnm-core-public/nm-vpn-plugin-info.h index aa319a57..167af52c 100644 --- a/src/libnm-core-public/nm-vpn-plugin-info.h +++ b/src/libnm-core-public/nm-vpn-plugin-info.h @@ -62,7 +62,7 @@ NM_AVAILABLE_IN_1_4 const char *nm_vpn_plugin_info_get_auth_dialog(NMVpnPluginInfo *self); NM_AVAILABLE_IN_1_4 gboolean nm_vpn_plugin_info_supports_hints(NMVpnPluginInfo *self); -NM_AVAILABLE_IN_1_2 +NM_AVAILABLE_IN_1_40_4 gboolean nm_vpn_plugin_info_supports_multiple(NMVpnPluginInfo *self); NM_AVAILABLE_IN_1_4 const char *const *nm_vpn_plugin_info_get_aliases(NMVpnPluginInfo *self); |