diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-22 20:31:00 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-31 20:15:24 +0200 |
| commit | 2c1a178f5bd815146a3079c3a188fae3b0491377 (patch) | |
| tree | 012ece01a20b91b396b1ea2cf0ca9fc2b7e38491 /libnm-core/nm-setting-connection.c | |
| parent | 7b5712acd25577ed61da5d10c26f724116f03cee (diff) | |
| download | NetworkManager-2c1a178f5bd815146a3079c3a188fae3b0491377.tar.gz | |
core: negotiate the best base setting
When the two base settings are present, use one of higher priority.
This will pick the "bridge" setting when both "bridge" and "bluetooth" are
present for a Bluetooth NAP connection.
Diffstat (limited to 'libnm-core/nm-setting-connection.c')
| -rw-r--r-- | libnm-core/nm-setting-connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 2d2247fe4c..257d6621af 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -926,7 +926,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } base_type = nm_setting_lookup_type (priv->type); - if (base_type == G_TYPE_INVALID || !_nm_setting_type_is_base_type (base_type)) { + if (base_type == G_TYPE_INVALID || !_nm_setting_type_get_base_type_priority (base_type)) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, |