2008-05-29 Dan Williams <dcbw@redhat.com>

* src/nm-device-802-11-wireless.c
		- (real_get_best_auto_connection): auto-activate 'shared' method
			connections too



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3710 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-29 20:55:05 +00:00
parent cab22d895c
commit d1f092b539
2 changed files with 12 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2008-05-29 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c
- (real_get_best_auto_connection): auto-activate 'shared' method
connections too
2008-05-29 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ip4-config.c

View file

@ -944,6 +944,7 @@ real_get_best_auto_connection (NMDevice *dev,
NMConnection *connection = NM_CONNECTION (iter->data);
NMSettingConnection *s_con;
NMSettingWireless *s_wireless;
NMSettingIP4Config *s_ip4;
s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
if (s_con == NULL)
@ -962,6 +963,11 @@ real_get_best_auto_connection (NMDevice *dev,
continue;
}
/* Use the connection if it's a shared connection */
s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
if (s_ip4 && !strcmp (s_ip4->method, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
return connection;
for (ap_iter = priv->ap_list; ap_iter; ap_iter = g_slist_next (ap_iter)) {
NMAccessPoint *ap = NM_AP (ap_iter->data);