From d465e5fac63f36bcf4069e36827f4b62c494556d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 May 2011 19:57:25 +0200 Subject: Imported Upstream version 0.8.9997 --- docs/libnm-glib/html/NMDevice.html | 52 ++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 5 deletions(-) (limited to 'docs/libnm-glib/html/NMDevice.html') diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 3af508c4..f7f01aa2 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -56,6 +56,7 @@ #define NM_DEVICE_IP6_CONFIG #define NM_DEVICE_DHCP6_CONFIG #define NM_DEVICE_STATE +#define NM_DEVICE_ACTIVE_CONNECTION #define NM_DEVICE_VENDOR #define NM_DEVICE_PRODUCT NMDevice; @@ -75,6 +76,7 @@ const char * NMIP6Config * nm_device_get_ip6_config (NMDevice *device); NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); +NMActiveConnection * nm_device_get_active_connection (NMDevice *device); const char * nm_device_get_product (NMDevice *device); const char * nm_device_get_vendor (NMDevice *device); void (*NMDeviceDeactivateFn) (NMDevice *device, @@ -86,7 +88,7 @@ const char * GSList * nm_device_filter_connections (NMDevice *device, const GSList *connections); gboolean nm_device_connection_valid (NMDevice *device, - NMConnection *connection); + NMConnection *connection);
@@ -105,6 +107,7 @@ const char *

Properties

+  "active-connection"        NMActiveConnection*   : Read
   "capabilities"             guint                 : Read
   "device-type"              guint                 : Read / Write / Construct Only
   "dhcp4-config"             NMDHCP4Config*        : Read
@@ -240,6 +243,14 @@ const char *          
+

NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+
+

+

+
+
+

NM_DEVICE_VENDOR

#define NM_DEVICE_VENDOR "vendor"
 
@@ -620,6 +631,29 @@ Gets the current
+

nm_device_get_active_connection ()

+
NMActiveConnection *  nm_device_get_active_connection   (NMDevice *device);
+

+Gets the NMActiveConnection object which owns this device during activation. +

+
++ + + + + + + + + + +

device :

a NMDevice +

Returns :

the NMActiveConnection +
+
+
+

nm_device_get_product ()

const char *          nm_device_get_product             (NMDevice *device);

@@ -728,13 +762,13 @@ incompatible with the device.

connections :

-a list of NMConnection objects to filter. [element-type NetworkManager.Connection] +a list of NMConnection objects to filter. [element-type NetworkManager.Connection]

Returns :

a -list of NMConnection objects that could be activated with the given device. +list of NMConnection objects that could be activated with the given device. The elements of the list are owned by their creator and should not be freed by the caller, but the returned list itself is owned by the caller and should be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] @@ -747,7 +781,7 @@ be freed with

nm_device_connection_valid ()

gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
+ NMConnection *connection);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if @@ -766,7 +800,7 @@ device.

connection :

-an NMConnection to validate against device +an NMConnection to validate against device @@ -782,6 +816,14 @@ if is incompatible with the device's capabilities and characteristics.

Property Details

+

The "active-connection" property

+
  "active-connection"        NMActiveConnection*   : Read
+

+The NMActiveConnection object that "owns" this device during activation. +

+
+
+

The "capabilities" property

  "capabilities"             guint                 : Read

-- cgit 1.3.0-6-gf8a5