diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-21 10:42:53 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-21 10:42:53 +0200 |
| commit | 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (patch) | |
| tree | a9ac1e67d0c22a48330c76f08fc5291f85307055 /src/nm-active-connection.c | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Imported Upstream version 0.8.4.0 upstream/0.8.4.0
Diffstat (limited to 'src/nm-active-connection.c')
| -rw-r--r-- | src/nm-active-connection.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 2f9a8f97..90495bd2 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -33,7 +33,29 @@ 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_specific_object, guint prop_devices, @@ -42,6 +64,13 @@ 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", @@ -68,7 +97,7 @@ nm_active_connection_install_properties (GObjectClass *object_class, "State", "State", NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, + NM_ACTIVE_CONNECTION_STATE_ACTIVATED, NM_ACTIVE_CONNECTION_STATE_UNKNOWN, G_PARAM_READABLE)); |