diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-18 18:08:24 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-23 13:48:51 +0200 |
| commit | 1fff1a3d36788391fc004601c4b3f8da449b3760 (patch) | |
| tree | d0d38d24d1d0927917c57cacd086fd232650893b | |
| parent | d727e25663b58ee42a19189196cdfd3e6b347f74 (diff) | |
| download | NetworkManager-1fff1a3d36788391fc004601c4b3f8da449b3760.tar.gz | |
libnm,core: don't mix up enum types
Touches a weak spot on clang's soul.
(cherry picked from commit fd41aa451bc83d17565bfd57f68558c9aff6358f)
| -rw-r--r-- | libnm-glib/nm-client.c | 2 | ||||
| -rw-r--r-- | libnm/nm-client.c | 2 | ||||
| -rw-r--r-- | libnm/nm-manager.c | 2 | ||||
| -rw-r--r-- | src/devices/wifi/nm-wifi-ap.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index b9e393d965..d62a8b6320 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -1420,7 +1420,7 @@ nm_client_get_connectivity (NMClient *client) { 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); _nm_object_ensure_inited (NM_OBJECT (client)); diff --git a/libnm/nm-client.c b/libnm/nm-client.c index ef73e329b2..e0a2a7b4f4 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -471,7 +471,7 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission NMConnectivityState 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); } diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 1abb513021..003d6b8755 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -568,7 +568,7 @@ nm_manager_get_permission_result (NMManager *manager, NMClientPermission permiss NMConnectivityState 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; } diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index ee07cf40dd..66d73563f9 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -808,7 +808,7 @@ nm_ap_set_ssid (NMAccessPoint *ap, const guint8 *ssid, gsize len) NM80211ApFlags 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; } |