diff options
Diffstat (limited to 'src/nm-active-connection.c')
| -rw-r--r-- | src/nm-active-connection.c | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 90495bd2..ae2afb07 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -33,30 +33,9 @@ nm_active_connection_get_next_object_path (void) } void -nm_active_connection_scope_to_value (NMConnection *connection, GValue *value) -{ - if (!connection) { - g_value_set_string (value, ""); - return; - } - - switch (nm_connection_get_scope (connection)) { - case NM_CONNECTION_SCOPE_SYSTEM: - g_value_set_string (value, NM_DBUS_SERVICE_SYSTEM_SETTINGS); - break; - case NM_CONNECTION_SCOPE_USER: - g_value_set_string (value, NM_DBUS_SERVICE_USER_SETTINGS); - break; - default: - nm_log_err (LOGD_CORE, "unknown connection scope!"); - break; - } -} - -void nm_active_connection_install_properties (GObjectClass *object_class, - guint prop_service_name, guint prop_connection, + guint prop_uuid, guint prop_specific_object, guint prop_devices, guint prop_state, @@ -64,13 +43,6 @@ nm_active_connection_install_properties (GObjectClass *object_class, guint prop_default6, guint prop_vpn) { - g_object_class_install_property (object_class, prop_service_name, - g_param_spec_string (NM_ACTIVE_CONNECTION_SERVICE_NAME, - "Service name", - "Service name", - NULL, - G_PARAM_READABLE)); - g_object_class_install_property (object_class, prop_connection, g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION, "Connection", @@ -78,6 +50,13 @@ nm_active_connection_install_properties (GObjectClass *object_class, DBUS_TYPE_G_OBJECT_PATH, G_PARAM_READABLE)); + g_object_class_install_property (object_class, prop_uuid, + g_param_spec_string (NM_ACTIVE_CONNECTION_UUID, + "Connection UUID", + "Connection UUID", + NULL, + G_PARAM_READABLE)); + g_object_class_install_property (object_class, prop_specific_object, g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, "Specific object", @@ -97,7 +76,7 @@ nm_active_connection_install_properties (GObjectClass *object_class, "State", "State", NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - NM_ACTIVE_CONNECTION_STATE_ACTIVATED, + NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, NM_ACTIVE_CONNECTION_STATE_UNKNOWN, G_PARAM_READABLE)); |