libnm,core: don't mix up enum types

Touches a weak spot on clang's soul.

diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index b9e393d..d62a8b6 100644 (file)
--- 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 ef73e32..e0a2a7b 100644 (file)
--- 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 1abb513..003d6b8 100644 (file)
--- 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 05ca88e..c0f8b11 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -777,7 +777,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;
 }