Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

1 files changed, 40 insertions, 0 deletions

diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h
index 26c1b1ee..01cd1503 100644
--- a/libnm-core/nm-setting.h
+++ b/libnm-core/nm-setting.h
@@ -333,6 +333,46 @@ gboolean    nm_setting_set_secret_flags (NMSetting *setting,
 
 /*****************************************************************************/
 
+NM_AVAILABLE_IN_1_26
+GVariant *nm_setting_option_get (NMSetting *setting,
+                                 const char *opt_name);
+
+NM_AVAILABLE_IN_1_26
+gboolean nm_setting_option_get_boolean (NMSetting *setting,
+                                        const char *opt_name,
+                                        gboolean *out_value);
+
+NM_AVAILABLE_IN_1_26
+gboolean nm_setting_option_get_uint32 (NMSetting *setting,
+                                       const char *opt_name,
+                                       guint32 *out_value);
+
+NM_AVAILABLE_IN_1_26
+void nm_setting_option_set (NMSetting *setting,
+                            const char *opt_name,
+                            GVariant *variant);
+
+NM_AVAILABLE_IN_1_26
+void nm_setting_option_set_uint32 (NMSetting *setting,
+                                   const char *opt_name,
+                                   guint32 value);
+
+NM_AVAILABLE_IN_1_26
+void nm_setting_option_set_boolean (NMSetting *setting,
+                                    const char *opt_name,
+                                    gboolean value);
+
+NM_AVAILABLE_IN_1_26
+const char *const*nm_setting_option_get_all_names (NMSetting *setting,
+                                                   guint *out_len);
+
+
+NM_AVAILABLE_IN_1_26
+void nm_setting_option_clear_by_name (NMSetting *setting,
+                                      NMUtilsPredicateStr predicate);
+
+/*****************************************************************************/
+
 const GVariantType *nm_setting_get_dbus_property_type (NMSetting *setting,
                                                        const char *property_name);