summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libnm-core/nm-setting-connection.c4
-rw-r--r--libnm-core/nm-setting-connection.h1
-rw-r--r--libnm/libnm.ver9
3 files changed, 12 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index e727e97e0b..f0d50f3a98 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -613,6 +613,8 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,
*
* Returns: whether slaves of the connection should be activated together
* with the connection.
+ *
+ * Since: 1.0.4
**/
NMSettingConnectionAutoconnectSlaves
nm_setting_connection_get_autoconnect_slaves (NMSettingConnection *setting)
@@ -1559,6 +1561,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
* 1: activate all the slave connections with this connection, -1: default.
* If -1 (default) is set, global connection.autoconnect-slaves is read to
* determine the real value. If it is default as well, this fallbacks to 0.
+ *
+ * Since: 1.0.4
**/
/* ---ifcfg-rh---
* property: autoconnect-slaves
diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h
index 1e365dd3ca..2be36b52cd 100644
--- a/libnm-core/nm-setting-connection.h
+++ b/libnm-core/nm-setting-connection.h
@@ -131,6 +131,7 @@ const char *nm_setting_connection_get_master (NMSettingConnection *set
gboolean nm_setting_connection_is_slave_type (NMSettingConnection *setting,
const char *type);
const char *nm_setting_connection_get_slave_type (NMSettingConnection *setting);
+NM_AVAILABLE_IN_1_0_4
NMSettingConnectionAutoconnectSlaves nm_setting_connection_get_autoconnect_slaves (NMSettingConnection *setting);
guint32 nm_setting_connection_get_num_secondaries (NMSettingConnection *setting);
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 88a79a88b8..294bab4109 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -466,10 +466,8 @@ global:
nm_setting_compare_flags_get_type;
nm_setting_connection_add_permission;
nm_setting_connection_add_secondary;
- nm_setting_connection_autoconnect_slaves_get_type;
nm_setting_connection_get_autoconnect;
nm_setting_connection_get_autoconnect_priority;
- nm_setting_connection_get_autoconnect_slaves;
nm_setting_connection_get_connection_type;
nm_setting_connection_get_gateway_ping_timeout;
nm_setting_connection_get_id;
@@ -846,3 +844,10 @@ global:
local:
*;
};
+
+libnm_1_0_4 {
+global:
+ nm_setting_connection_autoconnect_slaves_get_type;
+ nm_setting_connection_get_autoconnect_slaves;
+} libnm_1_0_0;
+