colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-10-23 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-activation-request.c
		- (get_secrets_cb): handle getting a setting back that is more than
			just secrets (ie, user changed auth or EAP method or something)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3012 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-10-23 18:34:42 +00:00
parent fbd22c96bb
commit 5bd382de25
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nm-activation-request.c
View File

@@ -187,7 +187,21 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
}
if (g_hash_table_size (secrets) > 0) {
nm_connection_update_secrets (priv->connection, info->setting_name, secrets);
NMSetting *setting;
/* Check whether a complete & valid NMSetting object was returned. If
* yes, replace the setting object in the connection. If not, just try
* updating the secrets.
*/
setting = nm_setting_wireless_security_new ();
nm_setting_populate_from_hash (setting, secrets);
if (nm_setting_verify (setting))
nm_connection_add_setting (priv->connection, setting);
else {
nm_connection_update_secrets (priv->connection, info->setting_name, secrets);
nm_setting_destroy (setting);
}
g_signal_emit (info->req,
signals[CONNECTION_SECRETS_UPDATED],
0,