From c53aa093e10de0af86de7a8008e1fad89335be09 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 8 Apr 2008 03:58:43 +0000 Subject: [PATCH] 2008-04-07 Dan Williams * libnm-glib/nm-device.c libnm-glib/nm-device.h - Proxy the 'managed' property git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3543 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ libnm-glib/nm-device.c | 31 +++++++++++++++++++++++++++++++ libnm-glib/nm-device.h | 2 ++ 3 files changed, 39 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1319bc8a8c..e8ab10a7c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-07 Dan Williams + + * libnm-glib/nm-device.c + libnm-glib/nm-device.h + - Proxy the 'managed' property + 2008-04-07 Dan Williams * src/nm-gsm-device.c diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 6372177b38..472cc4249e 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -24,6 +24,7 @@ typedef struct { char *udi; char *driver; guint32 capabilities; + gboolean managed; NMIP4Config *ip4_config; gboolean null_ip4_config; NMDeviceState state; @@ -37,6 +38,7 @@ enum { PROP_UDI, PROP_DRIVER, PROP_CAPABILITIES, + PROP_MANAGED, PROP_IP4_CONFIG, PROP_STATE, PROP_PRODUCT, @@ -104,6 +106,7 @@ register_for_property_changed (NMDevice *device) { NM_DEVICE_INTERFACE, nm_object_demarshal_generic, &priv->iface }, { NM_DEVICE_DRIVER, nm_object_demarshal_generic, &priv->driver }, { NM_DEVICE_CAPABILITIES, nm_object_demarshal_generic, &priv->capabilities }, + { NM_DEVICE_MANAGED, nm_object_demarshal_generic, &priv->managed }, { NM_DEVICE_IP4_CONFIG, demarshal_ip4_config, &priv->ip4_config }, { NM_DEVICE_STATE, nm_object_demarshal_generic, &priv->state }, { NULL }, @@ -194,6 +197,9 @@ get_property (GObject *object, case PROP_CAPABILITIES: g_value_set_uint (value, nm_device_get_capabilities (device)); break; + case PROP_MANAGED: + g_value_set_boolean (value, nm_device_get_managed (device)); + break; case PROP_IP4_CONFIG: g_value_set_object (value, nm_device_get_ip4_config (device)); break; @@ -258,6 +264,14 @@ nm_device_class_init (NMDeviceClass *device_class) 0, G_MAXUINT32, 0, G_PARAM_READABLE)); + g_object_class_install_property + (object_class, PROP_MANAGED, + g_param_spec_boolean (NM_DEVICE_MANAGED, + "Managed", + "Managed", + FALSE, + G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_IP4_CONFIG, g_param_spec_object (NM_DEVICE_IP4_CONFIG, @@ -421,6 +435,23 @@ nm_device_get_capabilities (NMDevice *device) return priv->capabilities; } +gboolean +nm_device_get_managed (NMDevice *device) +{ + NMDevicePrivate *priv; + + g_return_val_if_fail (NM_IS_DEVICE (device), 0); + + priv = NM_DEVICE_GET_PRIVATE (device); + if (!priv->managed) { + priv->managed = nm_object_get_boolean_property (NM_OBJECT (device), + NM_DBUS_INTERFACE_DEVICE, + "Managed"); + } + + return priv->managed; +} + NMIP4Config * nm_device_get_ip4_config (NMDevice *device) { diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index afafcf11b4..4ee420fa33 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -22,6 +22,7 @@ G_BEGIN_DECLS #define NM_DEVICE_INTERFACE "interface" #define NM_DEVICE_DRIVER "driver" #define NM_DEVICE_CAPABILITIES "capabilities" +#define NM_DEVICE_MANAGED "managed" #define NM_DEVICE_IP4_CONFIG "ip4-config" #define NM_DEVICE_STATE "state" #define NM_DEVICE_VENDOR "vendor" @@ -43,6 +44,7 @@ const char * nm_device_get_iface (NMDevice *device); const char * nm_device_get_udi (NMDevice *device); const char * nm_device_get_driver (NMDevice *device); guint32 nm_device_get_capabilities (NMDevice *device); +gboolean nm_device_get_managed (NMDevice *device); NMIP4Config * nm_device_get_ip4_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); const char * nm_device_get_product (NMDevice *device);