fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 08:50:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: merge branch 'bg/manager-state-bgo776001'

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=776001

(cherry picked from commit a7938a5b2c)
This commit is contained in:
Beniamino Galvani 2016-12-14 10:22:23 +01:00
commit 9afbaa86ce
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nm-manager.c
View file

@ -746,9 +746,7 @@ checked_connectivity (GObject *object, GAsyncResult *result, gpointer user_data)
if (connectivity == NM_CONNECTIVITY_FULL)
set_state (manager, NM_STATE_CONNECTED_GLOBAL);
else if ( connectivity == NM_CONNECTIVITY_PORTAL
|| connectivity == NM_CONNECTIVITY_LIMITED)
set_state (manager, NM_STATE_CONNECTED_SITE);
_notify (manager, PROP_CONNECTIVITY);
}
@ -5655,7 +5653,6 @@ get_property (GObject *object, guint prop_id,
g_value_set_string (value, VERSION);
break;
case PROP_STATE:
nm_manager_update_state (self);
g_value_set_uint (value, priv->state);
break;
case PROP_STARTUP: