diff --git a/src/knownnetworks.c b/src/knownnetworks.c index 2a3a6da6..0fa55d56 100644 --- a/src/knownnetworks.c +++ b/src/knownnetworks.c @@ -368,11 +368,18 @@ void known_network_update(struct network_info *network, network->is_hidden = is_hidden; - if (!l_settings_get_bool(settings, "Settings", "Autoconnect", - &is_autoconnectable)) - /* If no entry, default to Autoconnectable=True */ + 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)) + l_warn("Autoconnect setting is deprecated, use" + " AutoConnect instead"); + } + known_network_set_autoconnect(network, is_autoconnectable); } @@ -576,7 +583,7 @@ static struct l_dbus_message *known_network_property_set_autoconnect( if (!settings) return dbus_error_failed(message); - l_settings_set_bool(settings, "Settings", "Autoconnect", autoconnect); + l_settings_set_bool(settings, "Settings", "AutoConnect", autoconnect); network->ops->sync(network, settings); l_settings_free(settings); @@ -679,10 +686,17 @@ static void known_network_new(const char *ssid, enum security security, &is_hidden)) is_hidden = false; - if (!l_settings_get_bool(settings, "Settings", "Autoconnect", - &is_autoconnectable)) + if (!l_settings_get_bool(settings, "Settings", "AutoConnect", + &is_autoconnectable)) { 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) num_known_hidden_networks++;