knownnetworks: Do not check legacy Autoconnect setting

This commit is contained in:
Denis Kenzior 2021-06-01 10:32:48 -05:00
parent b9304eaf20
commit 6d9d2f5b89
1 changed files with 3 additions and 17 deletions

View File

@ -376,17 +376,10 @@ void known_network_update(struct network_info *network,
network->is_hidden = is_hidden; network->is_hidden = is_hidden;
/* If no entry, default to AutoConnectable=True */
if (!l_settings_get_bool(settings, "Settings", "AutoConnect", if (!l_settings_get_bool(settings, "Settings", "AutoConnect",
&is_autoconnectable)) {
/* If no entry, default to AutoConnectable=True */
is_autoconnectable = true;
/* Try legacy property name just in case */
if (l_settings_get_bool(settings, "Settings", "Autoconnect",
&is_autoconnectable)) &is_autoconnectable))
l_warn("Autoconnect setting is deprecated, use" is_autoconnectable = true;
" AutoConnect instead");
}
known_network_set_autoconnect(network, is_autoconnectable); known_network_set_autoconnect(network, is_autoconnectable);
} }
@ -695,16 +688,9 @@ static void known_network_new(const char *ssid, enum security security,
is_hidden = false; is_hidden = false;
if (!l_settings_get_bool(settings, "Settings", "AutoConnect", if (!l_settings_get_bool(settings, "Settings", "AutoConnect",
&is_autoconnectable)) { &is_autoconnectable))
is_autoconnectable = true; is_autoconnectable = true;
/* Try legacy property name just in case */
if (l_settings_get_bool(settings, "Settings", "Autoconnect",
&is_autoconnectable))
l_warn("Autoconnect setting is deprecated, use"
" AutoConnect instead");
}
if (is_hidden) if (is_hidden)
num_known_hidden_networks++; num_known_hidden_networks++;