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

cli: use libnm-util's constants for settings types

Browse Source
This commit is contained in:
Jiří Klimeš
2011-09-06 16:04:12 +02:00
parent 5c2927e40f
commit 46b01cb057
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/connections.c
View File

@@ -1061,7 +1061,7 @@ find_device_for_connection (NmCli *nmc,
g_assert (s_con); g_assert (s_con);
con_type = nm_setting_connection_get_connection_type (s_con); con_type = nm_setting_connection_get_connection_type (s_con);
if (strcmp (con_type, "vpn") == 0) { if (strcmp (con_type, NM_SETTING_VPN_SETTING_NAME) == 0) {
/* VPN connections */ /* VPN connections */
NMActiveConnection *active = NULL; NMActiveConnection *active = NULL;
if (iface) { if (iface) {
@@ -1104,7 +1104,7 @@ find_device_for_connection (NmCli *nmc,
} }
} }
if (found_device && ap && !strcmp (con_type, "802-11-wireless") && NM_IS_DEVICE_WIFI (dev)) { if (found_device && ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) {
char *bssid_up = g_ascii_strup (ap, -1); char *bssid_up = g_ascii_strup (ap, -1);
const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev));
found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */ found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */