From d1f092b5392f75f5684917ac869f59e02831e655 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 29 May 2008 20:55:05 +0000 Subject: [PATCH] 2008-05-29 Dan Williams * 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 --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 675ebcc750..6d016fda34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-29 Dan Williams + + * src/nm-device-802-11-wireless.c + - (real_get_best_auto_connection): auto-activate 'shared' method + connections too + 2008-05-29 Dan Williams * libnm-util/nm-setting-ip4-config.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index f41a4a5a87..9bc9fa5952 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -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);