diff options
Diffstat (limited to 'src/nm-device.c')
| -rw-r--r-- | src/nm-device.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/nm-device.c b/src/nm-device.c index ebd8cdb9..4b7ec5df 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -3463,6 +3463,7 @@ get_property (GObject *object, guint prop_id, NMDevice *self = NM_DEVICE (object); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDeviceState state; + const char *ac_path = NULL; state = nm_device_get_state (self); @@ -3518,6 +3519,11 @@ get_property (GObject *object, guint prop_id, case NM_DEVICE_INTERFACE_PROP_STATE: g_value_set_uint (value, priv->state); break; + case NM_DEVICE_INTERFACE_PROP_ACTIVE_CONNECTION: + if (priv->act_request) + ac_path = nm_act_request_get_active_connection_path (priv->act_request); + g_value_set_boxed (value, ac_path ? ac_path : "/"); + break; case NM_DEVICE_INTERFACE_PROP_DEVICE_TYPE: g_value_set_uint (value, priv->type); break; @@ -3616,6 +3622,10 @@ nm_device_class_init (NMDeviceClass *klass) NM_DEVICE_INTERFACE_STATE); g_object_class_override_property (object_class, + NM_DEVICE_INTERFACE_PROP_ACTIVE_CONNECTION, + NM_DEVICE_INTERFACE_ACTIVE_CONNECTION); + + g_object_class_override_property (object_class, NM_DEVICE_INTERFACE_PROP_DEVICE_TYPE, NM_DEVICE_INTERFACE_DEVICE_TYPE); @@ -3809,7 +3819,7 @@ reason_to_string (NMDeviceStateReason reason) case NM_DEVICE_STATE_REASON_USER_REQUESTED: return "user-requested"; case NM_DEVICE_STATE_REASON_CARRIER: - return "carrier-chagned"; + return "carrier-changed"; case NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: return "connection-assumed"; case NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: |