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

libnm,core: don't mix up enum types

Browse Source 
Touches a weak spot on clang's soul.
This commit is contained in:
Lubomir Rintel
2015-03-18 18:08:24 +01:00
parent 1e646f30f2
commit fd41aa451b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-glib/nm-client.c
View File

@@ -1420,7 +1420,7 @@ nm_client_get_connectivity (NMClient *client)
{ {
NMClientPrivate *priv; NMClientPrivate *priv;
g_return_val_if_fail (NM_IS_CLIENT (client), NM_STATE_UNKNOWN); g_return_val_if_fail (NM_IS_CLIENT (client), NM_CONNECTIVITY_UNKNOWN);
priv = NM_CLIENT_GET_PRIVATE (client); priv = NM_CLIENT_GET_PRIVATE (client);
_nm_object_ensure_inited (NM_OBJECT (client)); _nm_object_ensure_inited (NM_OBJECT (client));

2
libnm/nm-client.c
View File

@@ -471,7 +471,7 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission
NMConnectivityState NMConnectivityState
nm_client_get_connectivity (NMClient *client) nm_client_get_connectivity (NMClient *client)
{ {
g_return_val_if_fail (NM_IS_CLIENT (client), NM_STATE_UNKNOWN); g_return_val_if_fail (NM_IS_CLIENT (client), NM_CONNECTIVITY_UNKNOWN);
return nm_manager_get_connectivity (NM_CLIENT_GET_PRIVATE (client)->manager); return nm_manager_get_connectivity (NM_CLIENT_GET_PRIVATE (client)->manager);
} }

2
libnm/nm-manager.c
View File

@@ -568,7 +568,7 @@ nm_manager_get_permission_result (NMManager *manager, NMClientPermission permiss
NMConnectivityState NMConnectivityState
nm_manager_get_connectivity (NMManager *manager) nm_manager_get_connectivity (NMManager *manager)
{ {
g_return_val_if_fail (NM_IS_MANAGER (manager), NM_STATE_UNKNOWN); g_return_val_if_fail (NM_IS_MANAGER (manager), NM_CONNECTIVITY_UNKNOWN);
return NM_MANAGER_GET_PRIVATE (manager)->connectivity; return NM_MANAGER_GET_PRIVATE (manager)->connectivity;
} }

2
src/devices/wifi/nm-wifi-ap.c
View File

@@ -777,7 +777,7 @@ nm_ap_set_ssid (NMAccessPoint *ap, const guint8 *ssid, gsize len)
NM80211ApFlags NM80211ApFlags
nm_ap_get_flags (NMAccessPoint *ap) nm_ap_get_flags (NMAccessPoint *ap)
{ {
g_return_val_if_fail (NM_IS_AP (ap), NM_802_11_AP_SEC_NONE); g_return_val_if_fail (NM_IS_AP (ap), NM_802_11_AP_FLAGS_NONE);
return NM_AP_GET_PRIVATE (ap)->flags; return NM_AP_GET_PRIVATE (ap)->flags;
} }