Skip to content

Backport !719 “Handle an UNKNOWN NetworkManager connectivity as NONE” to glib-2-60

Philip Withnall requested to merge pwithnall/glib:backport-719-nm-monitor-check-glib-2-60 into glib-2-60

nm_conn_to_g_conn already handles UNKNOWN like NONE (returning G_NETWORK_CONNECTIVITY_LOCAL in both cases). So in sync_properties we should also set new_connectivity to G_NETWORK_CONNECTIVITY_LOCAL for both NM_CONNECTIVITY_UNKNOWN and NM_CONNECTIVITY_NONE.

This has the added benefit that when NetworkManager returns the network connectivity is UNKNOWN, we set network_available to FALSE as it should be. Previously, there were cases in a laptop with no network access, that g_network_monitor_get_network_available returned true, which was wrong and is also fixed with this commit.

Backport of !719 (merged).

Merge request reports