diff --git a/docs/api/migrating-to-09.xml b/docs/api/migrating-to-09.xml index 277d61b2aa..a73c7b7c04 100644 --- a/docs/api/migrating-to-09.xml +++ b/docs/api/migrating-to-09.xml @@ -445,12 +445,6 @@ go to sleep or wake up. - - state() method - - Use the State property instead. - - diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index f9641a471e..5eb4614f38 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -212,6 +212,15 @@ + + + The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. + + + + + Indicates if overall networking is currently enabled or not. See the diff --git a/src/nm-manager.c b/src/nm-manager.c index aa53430b1a..e2ccf47c72 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -93,6 +93,10 @@ static void impl_manager_enable (NMManager *manager, static void impl_manager_get_permissions (NMManager *manager, DBusGMethodInvocation *context); +static gboolean impl_manager_get_state (NMManager *manager, + guint32 *state, + GError **error); + static gboolean impl_manager_set_logging (NMManager *manager, const char *level, const char *domains, @@ -2726,6 +2730,14 @@ impl_manager_get_permissions (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME, FALSE); } +static gboolean +impl_manager_get_state (NMManager *manager, guint32 *state, GError **error) +{ + nm_manager_update_state (manager); + *state = NM_MANAGER_GET_PRIVATE (manager)->state; + return TRUE; +} + static gboolean impl_manager_set_logging (NMManager *manager, const char *level,