diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /clients/cli/settings.h | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'clients/cli/settings.h')
| -rw-r--r-- | clients/cli/settings.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clients/cli/settings.h b/clients/cli/settings.h index 3c4c814f..bab00ee9 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -37,13 +37,13 @@ void nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMCo char **nmc_setting_get_valid_properties (NMSetting *setting); char *nmc_setting_get_property_desc (NMSetting *setting, const char *prop); -const char *nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop); +const char **nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop); char *nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error); -char *nmc_setting_get_property_out2in (NMSetting *setting, - const char *prop, - GError **error); +char *nmc_setting_get_property_parsable (NMSetting *setting, + const char *prop, + GError **error); gboolean nmc_setting_set_property (NMSetting *setting, const char *prop, const char *val, |