From 78c3b8801ecf4975e5da1af3b10ae20dd2d876de Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Apr 2016 21:11:10 +0200 Subject: Imported Upstream version 1.2.0 --- docs/libnm/html/NMDevice.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'docs/libnm/html/NMDevice.html') diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 67f70037..6dd8dd36 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -327,7 +327,7 @@ -NMConnection * +NMConnection * nm_device_get_applied_connection () @@ -343,7 +343,7 @@ -NMConnection * +NMConnection * nm_device_get_applied_connection_finish () @@ -1781,7 +1781,7 @@ devices in devices

nm_device_reapply ()

gboolean
 nm_device_reapply (NMDevice *device,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    guint64 version_id,
                    guint32 flags,
                    GCancellable *cancellable,
@@ -1804,7 +1804,7 @@ made since it was last applied.

 
 
 
connection

-
the NMConnection to replace the applied settings with or NULL to reuse existing

+
the NMConnection to replace the applied settings with or NULL to reuse existing

  
 
 
@@ -1844,7 +1844,7 @@ will be set.

 
nm_device_reapply_async ()

 
void
 nm_device_reapply_async (NMDevice *device,
-                         NMConnection *connection,
+                         NMConnection *connection,
                          guint64 version_id,
                          guint32 flags,
                          GCancellable *cancellable,
@@ -1868,7 +1868,7 @@ currently active connection made since it was last applied.

 
 
 
connection

-
the NMConnection to replace the applied settings with or NULL to reuse existing

+
the NMConnection to replace the applied settings with or NULL to reuse existing

  
 
 
@@ -1949,7 +1949,7 @@ will be set.

 

 

 
nm_device_get_applied_connection ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection (NMDevice *device,
                                   guint32 flags,
                                   guint64 *version_id,
@@ -1996,7 +1996,7 @@ the applied connection. 

 

 

 
Returns

-
 a NMConnection with the currently applied settings
+
 a NMConnection with the currently applied settings
 or NULL on error.

 
The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 

@@ -2058,7 +2058,7 @@ nm_device_get_applied_connection_async
 

 

 
nm_device_get_applied_connection_finish ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection_finish
                                (NMDevice *device,
                                 GAsyncResult *result,
@@ -2100,7 +2100,7 @@ connection. 

 

 

 
Returns

-
 a currently applied NMConnection or NULL in case
+
 a currently applied NMConnection or NULL in case
 of error.

 
The connection is as received from D-Bus and might not validate according
 to nm_connection_verify(). 

@@ -2395,7 +2395,7 @@ incompatible with the device. To get the full list of connections see
 
 
 
connections

-
 an array of NMConnections to filter. 

+
 an array of NMConnections to filter. 

 [element-type NMConnection]
 
 
@@ -2404,7 +2404,7 @@ incompatible with the device. To get the full list of connections see
 

 
Returns

 
 an array of
-NMConnections that could be activated with the given device
+NMConnections that could be activated with the given device
 .  The array
 should be freed with g_ptr_array_unref() when it is no longer required. 

 
[transfer container][element-type NMConnection]

@@ -2415,7 +2415,7 @@ should be freed with g_ptr_array_unref() when it i
 
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
 device
@@ -2441,7 +2441,7 @@ against

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
@@ -2459,7 +2459,7 @@ if is incompatible with the device's capabilities and characteristics.

 
nm_device_connection_compatible ()

 
gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

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

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
@@ -3022,7 +3022,7 @@ operations like addressing and routing.

 

 
The “ip4-config” property

 
  “ip4-config”               NMIPConfig *

-
The NMIP4Config of the device.

+
The NMIP4Config of the device.

 
Flags: Read

 

 

-- 
cgit 1.3.0-6-gf8a5