fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: use NM_SETTING_WIRELESS_MODE_* constants for mode property

Browse source 
and thus fix "infra" -> "infractructure"
This commit is contained in:
Jiří Klimeš 2013-10-25 13:43:22 +02:00
parent 0a557ac01d
commit 75723221f2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/devices/nm-device-wifi.c
View file

@ -1034,7 +1034,8 @@ check_connection_available (NMDevice *device, NMConnection *connection)
* started at any time. * started at any time.
*/ */
mode = nm_setting_wireless_get_mode (s_wifi); mode = nm_setting_wireless_get_mode (s_wifi);
if (g_strcmp0 (mode, "adhoc") == 0 || g_strcmp0 (mode, "ap") == 0) if ( g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0
|| g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_AP) == 0)
return TRUE; return TRUE;
/* Hidden SSIDs obviously don't always appear in the scan list either */ /* Hidden SSIDs obviously don't always appear in the scan list either */
@ -2807,11 +2808,11 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
g_assert (s_wireless); g_assert (s_wireless);
mode = nm_setting_wireless_get_mode (s_wireless); mode = nm_setting_wireless_get_mode (s_wireless);
if (g_strcmp0 (mode, "infra") == 0) if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_INFRA) == 0)
priv->mode = NM_802_11_MODE_INFRA; priv->mode = NM_802_11_MODE_INFRA;
else if (g_strcmp0 (mode, "adhoc") == 0) else if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0)
priv->mode = NM_802_11_MODE_ADHOC; priv->mode = NM_802_11_MODE_ADHOC;
else if (g_strcmp0 (mode, "ap") == 0) { else if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_AP) == 0) {
priv->mode = NM_802_11_MODE_AP; priv->mode = NM_802_11_MODE_AP;
/* Scanning not done in AP mode; clear the scan list */ /* Scanning not done in AP mode; clear the scan list */