From 7a00376b30607a46166409a4a9cc40ddf76e8328 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 18 Feb 2011 11:59:27 -0600 Subject: [PATCH] libnm-glib: nm_device_get_capabilities() should return NMDeviceCapabilities --- libnm-glib/nm-device.c | 4 ++-- libnm-glib/nm-device.h | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 1e542b7e93..cea53ef6f3 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -54,7 +54,7 @@ typedef struct { NMDeviceType device_type; char *udi; char *driver; - guint32 capabilities; + NMDeviceCapabilities capabilities; gboolean managed; gboolean firmware_missing; NMIP4Config *ip4_config; @@ -912,7 +912,7 @@ nm_device_get_driver (NMDevice *device) * * Returns: the capabilities **/ -guint32 +NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device) { NMDevicePrivate *priv; diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index afe2ae5285..0c330e0b1a 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -86,27 +86,27 @@ GType nm_device_get_type (void); GObject * nm_device_new (DBusGConnection *connection, const char *path); -const char * nm_device_get_iface (NMDevice *device); -const char * nm_device_get_ip_iface (NMDevice *device); -NMDeviceType nm_device_get_device_type (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); -gboolean nm_device_get_firmware_missing (NMDevice *device); -NMIP4Config * nm_device_get_ip4_config (NMDevice *device); -NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); -NMIP6Config * nm_device_get_ip6_config (NMDevice *device); -NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); -NMDeviceState nm_device_get_state (NMDevice *device); -const char * nm_device_get_product (NMDevice *device); -const char * nm_device_get_vendor (NMDevice *device); +const char * nm_device_get_iface (NMDevice *device); +const char * nm_device_get_ip_iface (NMDevice *device); +NMDeviceType nm_device_get_device_type (NMDevice *device); +const char * nm_device_get_udi (NMDevice *device); +const char * nm_device_get_driver (NMDevice *device); +NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device); +gboolean nm_device_get_managed (NMDevice *device); +gboolean nm_device_get_firmware_missing (NMDevice *device); +NMIP4Config * nm_device_get_ip4_config (NMDevice *device); +NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); +NMIP6Config * nm_device_get_ip6_config (NMDevice *device); +NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); +NMDeviceState nm_device_get_state (NMDevice *device); +const char * nm_device_get_product (NMDevice *device); +const char * nm_device_get_vendor (NMDevice *device); typedef void (*NMDeviceDeactivateFn) (NMDevice *device, GError *error, gpointer user_data); -void nm_device_disconnect (NMDevice *device, - NMDeviceDeactivateFn callback, - gpointer user_data); +void nm_device_disconnect (NMDevice *device, + NMDeviceDeactivateFn callback, + gpointer user_data); G_END_DECLS