Commit 764ade90 authored by stevenjb@chromium.org's avatar stevenjb@chromium.org

Use Name not SSID in CopyIdentifyingProperties

This also makes a minor change to WifiConfigView to update the 'Connect'
button enabled state after receiving wifi properties by calling
UpdateDialogButtons().

BUG=289642
R=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/23872021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223435 0039d316-1c4b-4281-b951-d872f2087c98
parent 642a157e
...@@ -1249,6 +1249,9 @@ void WifiConfigView::InitFromProperties( ...@@ -1249,6 +1249,9 @@ void WifiConfigView::InitFromProperties(
if (cert_index >= 0) { if (cert_index >= 0) {
// Skip item for "Default". // Skip item for "Default".
server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index); server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
} else {
// "Default"
server_ca_cert_combobox_->SetSelectedIndex(0);
} }
} }
} }
...@@ -1292,6 +1295,7 @@ void WifiConfigView::InitFromProperties( ...@@ -1292,6 +1295,7 @@ void WifiConfigView::InitFromProperties(
flimflam::kSaveCredentialsProperty, &save_credentials); flimflam::kSaveCredentialsProperty, &save_credentials);
save_credentials_checkbox_->SetChecked(save_credentials); save_credentials_checkbox_->SetChecked(save_credentials);
UpdateDialogButtons();
RefreshShareCheckbox(); RefreshShareCheckbox();
UpdateErrorLabel(); UpdateErrorLabel();
} }
......
...@@ -452,8 +452,6 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect( ...@@ -452,8 +452,6 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
if (!config_properties.empty()) { if (!config_properties.empty()) {
NET_LOG_EVENT("Configuring Network", service_path); NET_LOG_EVENT("Configuring Network", service_path);
if (shill_property_util::CopyIdentifyingProperties(service_properties,
&config_properties)) {
network_configuration_handler_->SetProperties( network_configuration_handler_->SetProperties(
service_path, service_path,
config_properties, config_properties,
...@@ -465,9 +463,6 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect( ...@@ -465,9 +463,6 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
service_path)); service_path));
return; return;
} }
NET_LOG_ERROR("Shill dictionary is missing some relevant entries",
service_path);
}
// Otherwise, we probably still need to configure the network since // Otherwise, we probably still need to configure the network since
// 'Connectable' is false. If |check_error_state| is true, signal an // 'Connectable' is false. If |check_error_state| is true, signal an
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment