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 --- ...org.freedesktop.NetworkManager.AccessPoint.html | 8 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 2 +- ...eedesktop.NetworkManager.Connection.Active.html | 2 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 2 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 16 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 2 +- ....freedesktop.NetworkManager.VPN.Connection.html | 6 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 6 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 12 +- docs/api/html/index.html | 2 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMAccessPoint.html | 24 +- docs/libnm-glib/html/NMActiveConnection.html | 28 +-- docs/libnm-glib/html/NMClient.html | 26 +- docs/libnm-glib/html/NMDevice.html | 36 +-- docs/libnm-glib/html/NMDeviceBt.html | 8 +- docs/libnm-glib/html/NMDeviceModem.html | 8 +- docs/libnm-glib/html/NMDeviceWifi.html | 8 +- docs/libnm-glib/html/NMIP4Config.html | 6 +- docs/libnm-glib/html/NMIP6Config.html | 8 +- docs/libnm-glib/html/NMRemoteConnection.html | 8 +- docs/libnm-glib/html/NMRemoteSettings.html | 32 +-- docs/libnm-glib/html/NMSecretAgent.html | 34 +-- docs/libnm-glib/html/NMVPNConnection.html | 4 +- docs/libnm-glib/html/NMWimaxNsp.html | 8 +- docs/libnm-glib/html/index.html | 4 +- docs/libnm-glib/html/index.sgml | 1 - docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 8 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 16 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 4 +- docs/libnm-glib/html/object-tree.html | 2 +- docs/libnm-glib/libnm-glib-docs.xml | 2 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMConnection.html | 2 +- docs/libnm-util/html/index.html | 4 +- docs/libnm-util/html/index.sgml | 1 - .../libnm-util/html/libnm-util-NetworkManager.html | 2 +- docs/libnm-util/libnm-util-docs.sgml | 2 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/NMAccessPoint.html | 8 +- docs/libnm/html/NMActiveConnection.html | 12 +- docs/libnm/html/NMClient.html | 16 +- docs/libnm/html/NMDevice.html | 34 +-- docs/libnm/html/NMRemoteConnection.html | 4 +- docs/libnm/html/NMSecretAgentOld.html | 18 +- docs/libnm/html/NMSetting.html | 10 +- docs/libnm/html/NMSettingConnection.html | 6 +- docs/libnm/html/NMSettingGeneric.html | 2 +- docs/libnm/html/NMSimpleConnection.html | 24 +- docs/libnm/html/NMVpnEditorPlugin.html | 44 ++-- docs/libnm/html/NMWimaxNsp.html | 8 +- docs/libnm/html/api-index-full.html | 6 +- docs/libnm/html/index.html | 4 +- docs/libnm/html/index.sgml | 1 - docs/libnm/html/libnm-NMConnection.html | 276 ++++++++++----------- docs/libnm/html/libnm-nm-errors.html | 20 +- docs/libnm/html/libnm-nm-utils.html | 2 +- docs/libnm/libnm-docs.xml | 2 +- docs/libnm/version.xml | 2 +- 61 files changed, 428 insertions(+), 429 deletions(-) (limited to 'docs') diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index ccf36e84..8669fdc9 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -87,7 +87,7 @@ Flags readable u

Flags describing the capabilities of the access point.

-

Returns: NM80211ApFlags +

Returns: NM80211ApFlags

@@ -99,7 +99,7 @@ WpaFlags readable u

Flags describing the access point's capabilities according to WPA (Wifi Protected Access).

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags

@@ -111,7 +111,7 @@ RsnFlags readable u

Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags

@@ -149,7 +149,7 @@ Mode readable u

Describes the operating mode of the access point.

-

Returns: NM80211Mode +

Returns: NM80211Mode

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index b32df401..91c82cd9 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -86,7 +86,7 @@ RegisterWithCapabilities (IN s identifier,

IN u capabilities:

-

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

+

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index 394b34fb..5078108b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -166,7 +166,7 @@ State readable u

The state of this active connection.

-

Returns: NMActiveConnectionState +

Returns: NMActiveConnectionState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index bf8d3abd..96d7124e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -98,7 +98,7 @@ BtCapabilities readable u

Bluetooth capabilities of the device (either DUN or NAP).

-

Returns: NMBluetoothCapabilities +

Returns: NMBluetoothCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index cc18c40f..d375b528 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -82,7 +82,7 @@ ModemCapabilities readable u firmware reload or other reinitialization to switch between eg CDMA/EVDO and GSM/UMTS.

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities

@@ -94,7 +94,7 @@ CurrentCapabilities readable u

The generic family of access technologies the modem currently supports without a firmware reload or reinitialization.

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index b13c244c..afe7fec5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -214,7 +214,7 @@ Mode readable u

The operating mode of the wireless device.

-

Returns: NM80211Mode +

Returns: NM80211Mode

@@ -253,7 +253,7 @@ WirelessCapabilities readable u

The capabilities of the wireless device.

-

Returns: NMDeviceWifiCapabilities +

Returns: NMDeviceWifiCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index 3acd8a78..4bcc0ccb 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -217,15 +217,15 @@ StateChanged (u new_state,

u new_state:

-

(NMDeviceState) The new state of the device.

+

(NMDeviceState) The new state of the device.

u old_state:

-

(NMDeviceState) The previous state of the device.

+

(NMDeviceState) The previous state of the device.

u reason:

-

(NMDeviceStateReason) A reason for the state transition.

+

(NMDeviceStateReason) A reason for the state transition.

@@ -307,7 +307,7 @@ Capabilities readable u

Flags describing the capabilities of the device.

-

Returns: NMDeviceCapabilities +

Returns: NMDeviceCapabilities

@@ -328,7 +328,7 @@ State readable u

The current state of the device.

-

Returns: NMDeviceState +

Returns: NMDeviceState

@@ -339,7 +339,7 @@ StateReason readable (uu)

The current state and reason for changing to that state.

-

Returns: A tuple of NMDeviceState and NMDeviceStateReason. +

Returns: A tuple of NMDeviceState and NMDeviceStateReason.

@@ -451,7 +451,7 @@ DeviceType readable u

The general type of the network device; ie Ethernet, WiFi, etc.

-

Returns: NMDeviceType +

Returns: NMDeviceType

@@ -494,7 +494,7 @@ Metered readable u

Whether the amount of traffic flowing through the device is subject to limitations, for example set by service providers.

-

Returns: NMMetered +

Returns: NMMetered

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index 6022ef16..23201a1f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -105,7 +105,7 @@ GetSecrets (IN a{sa{sv}} connection,

IN u flags:

-

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

+

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

OUT a{sa{sv}} secrets:

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index ebaad8d8..4bb08ff8 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -89,11 +89,11 @@ VpnStateChanged (u state,

u state:

-

(NMVpnConnectionState) The new state of the VPN connection.

+

(NMVpnConnectionState) The new state of the VPN connection.

u reason:

-

(NMVpnConnectionStateReason) Reason code describing the change to the new state.

+

(NMVpnConnectionStateReason) Reason code describing the change to the new state.

@@ -108,7 +108,7 @@ VpnState readable u

The VPN-specific state of the connection.

-

Returns: NMVpnConnectionState +

Returns: NMVpnConnectionState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index a5dc49ec..87db2178 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -272,7 +272,7 @@ StateChanged (u state);

u state:

-

(NMVpnServiceState) The new state of the plugin.

+

(NMVpnServiceState) The new state of the plugin.

@@ -395,7 +395,7 @@ Failure (u reason);

u reason:

-

(NMVpnPluginFailure) Reason code for the failure.

+

(NMVpnPluginFailure) Reason code for the failure.

@@ -409,7 +409,7 @@ State readable u

The state of the plugin.

-

Returns: NMVpnServiceState +

Returns: NMVpnServiceState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index 4fd2675c..a3468b7e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -398,7 +398,7 @@ CheckConnectivity (OUT u connectivity);

OUT u connectivity:

-

(NMConnectivityState) The current connectivity state.

+

(NMConnectivityState) The current connectivity state.

@@ -418,7 +418,7 @@ state (OUT u state);

OUT u state:

-

NMState

+

NMState

@@ -449,7 +449,7 @@ StateChanged (u state);

u state:

-

(NMState) The new state of NetworkManager.

+

(NMState) The new state of NetworkManager.

@@ -643,7 +643,7 @@ Metered readable u

Indicates whether the connectivity is metered. This is equivalent to the metered property of the device associated with the primary connection.

-

Returns: NMMetered +

Returns: NMMetered

@@ -685,7 +685,7 @@ State readable u

The overall state of the NetworkManager daemon.

-

Returns: NMState +

Returns: NMState

@@ -696,7 +696,7 @@ Connectivity readable u

The network connectivity state.

-

Returns: NMConnectivityState +

Returns: NMConnectivityState

diff --git a/docs/api/html/index.html b/docs/api/html/index.html index c3c1b2dc..e31a7500 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,7 +14,7 @@
-

Version 1.1.94 +

Version 1.2.0

Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors

diff --git a/docs/api/version.xml b/docs/api/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index a178775a..9b26174f 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -51,7 +51,7 @@ -NM80211ApFlags +NM80211ApFlags nm_access_point_get_flags () @@ -59,7 +59,7 @@ -NM80211ApSecurityFlags +NM80211ApSecurityFlags nm_access_point_get_wpa_flags () @@ -67,7 +67,7 @@ -NM80211ApSecurityFlags +NM80211ApSecurityFlags nm_access_point_get_rsn_flags () @@ -97,7 +97,7 @@ -NM80211Mode +NM80211Mode nm_access_point_get_mode () @@ -327,7 +327,7 @@ nm_access_point_new (

nm_access_point_get_flags ()

-
NM80211ApFlags
+
NM80211ApFlags
 nm_access_point_get_flags (NMAccessPoint *ap);

 
Gets the flags of the access point.

 

@@ -353,7 +353,7 @@ nm_access_point_get_flags (
 
nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_wpa_flags (NMAccessPoint *ap);

 
Gets the WPA (version 1) flags of the access point.

 

@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (
 

 
nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_rsn_flags (NMAccessPoint *ap);

 
Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.

@@ -486,7 +486,7 @@ nm_access_point_get_frequency (
 

 
nm_access_point_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_access_point_get_mode (NMAccessPoint *ap);

 
Gets the mode of the access point.

 

@@ -622,7 +622,7 @@ filter that list with this function.

 
 
connections

 
 a list of
-NMConnection objects to filter. 

+NMConnection objects to filter. 

 [element-type NMConnection]
 
 
@@ -631,7 +631,7 @@ filter that list with this function.

 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given ap
+list of NMConnection objects that could be activated with the given ap
 .
 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
@@ -644,7 +644,7 @@ be freed with g_slist_free() when it is no longer
 
nm_access_point_connection_valid ()

 
gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);

+                                  NMConnection *connection);

 
Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 ap
@@ -667,7 +667,7 @@ against

 
 
 
connection

-
an NMConnection to validate against ap
+
an NMConnection to validate against ap
 

  
 
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 51037dca..895f4e7b 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -93,7 +93,7 @@
 
 
 
-NMActiveConnectionState
+NMActiveConnectionState
 
 
 nm_active_connection_get_state ()
@@ -386,7 +386,7 @@ nm_active_connection_new (
nm_active_connection_get_connection ()

 
const char *
 nm_active_connection_get_connection (NMActiveConnection *connection);

-
Gets the NMConnection's DBus object path.  This is often used with
+
Gets the NMConnection's DBus object path.  This is often used with
 nm_remote_settings_get_connection_by_path() to retrieve the
 NMRemoteConnection object that describes the connection.

 

@@ -406,7 +406,7 @@ nm_active_connection_get_connection (
 

 
Returns

-
 the object path of the NMConnection which this NMActiveConnection
+
 the object path of the NMConnection which this NMActiveConnection
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.

 

@@ -416,7 +416,7 @@ connection, and must not be modified.

 
nm_active_connection_get_id ()

 
const char *
 nm_active_connection_get_id (NMActiveConnection *connection);

-
Gets the NMConnection's ID.

+
Gets the NMConnection's ID.

 

 
Parameters

 

@@ -434,7 +434,7 @@ nm_active_connection_get_id (
 
Returns

-
 the ID of the NMConnection that backs the NMActiveConnection.
+
 the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 
 
Since: 0.9.10

@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.
nm_active_connection_get_uuid ()

 
const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);

-
Gets the NMConnection's UUID.

+
Gets the NMConnection's UUID.

 

 
Parameters

 

@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (
 

 
Returns

-
 the UUID of the NMConnection that backs the NMActiveConnection.
+
 the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 

 
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.
const char *
 nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
-
Gets the NMConnection's type.

+
Gets the NMConnection's type.

 

 
Parameters

 

@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 
 

 
Returns

-
 the type of the NMConnection that backs the NMActiveConnection.
+
 the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 

 
Since: 0.9.10

@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. 

 

 

 
nm_active_connection_get_state ()

-
NMActiveConnectionState
+
NMActiveConnectionState
 nm_active_connection_get_state (NMActiveConnection *connection);

 
Gets the active connection's state.

 

@@ -655,7 +655,7 @@ nm_active_connection_get_ip4_config (
 
Returns

 
 the NMIP4Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 

@@ -687,7 +687,7 @@ nm_active_connection_get_dhcp4_config (
Returns

 
 the NMDHCP4Config, or NULL if the
 connection does not use DHCP, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 

 
Since: 0.9.10

@@ -743,7 +743,7 @@ nm_active_connection_get_ip6_config (
 
Returns

 
 the NMIP6Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 
@@ -775,7 +775,7 @@ nm_active_connection_get_dhcp6_config (
Returns

 
 the NMDHCP6Config, or NULL if the
 connection does not use DHCPv6, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 
 
Since: 0.9.10

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 865c607a..3d92860f 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -241,7 +241,7 @@
 
 
-
+
@@ -948,7 +948,7 @@ details of the newly added connection. 

 
nm_client_add_and_activate_connection ()

 
void
 nm_client_add_and_activate_connection (NMClient *client,
-                                       NMConnection *partial,
+                                       NMConnection *partial,
                                        NMDevice *device,
                                        const char *specific_object,
                                        NMClientAddActivateFn callback,
@@ -977,7 +977,7 @@ track the activation to its completion.

 

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

 
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
@@ -1747,7 +1747,7 @@ be freed with g_slist_free() when it is no longer
 
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
@@ -1773,7 +1773,7 @@ against

 
 

-
@@ -1791,7 +1791,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
@@ -1821,7 +1821,7 @@ against

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

 
nm_device_get_setting_type ()

 
GType
 nm_device_get_setting_type (NMDevice *device);

-
Gets the (primary) NMSetting subtype associated with connections
+
Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
 .

 

@@ -1865,7 +1865,7 @@ that can be used on device
 

 
Returns

 
 device
-'s associated NMSetting type

+'s associated NMSetting type

 

 
Since: 0.9.10

 

diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 8a0df6b0..75e07531 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -73,7 +73,7 @@
 
 
-
+
@@ -716,7 +716,7 @@ invisible to the current user.

 
-
+
@@ -748,7 +748,7 @@ still visible to the user.

 
-
+
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index ebc67526..0e1a4139 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-NMConnection object.  Once a connection is known to NetworkManager, having
+NMConnection object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 NMRemoteSettings object creates a NMRemoteConnection object which
 represents this stored connection.  Use the NMRemoteConnection object to
 perform any operations like modification or deletion.

 
To add a new network connection to the NetworkManager settings service, first
-build up a template NMConnection object.  Since this connection is not yet
+build up a template NMConnection object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an NMRemoteConnection.  Then ask NMRemoteSettings to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -368,7 +368,7 @@ the stored object known to NetworkManager.

    if (error)
        g_print ("Error adding connection: %s", error->message);
    else {
-       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
+       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
        /* Use 'remote' with nm_remote_connection_commit_changes() to save
         * changes and nm_remote_connection_delete() to delete the connection */
    }
@@ -383,28 +383,28 @@ the stored object known to NetworkManager.

    char *uuid;
    gboolean success;
 
-   connection = nm_connection_new ();
+   connection = nm_connection_new ();
 
    /* Build up the 'connection' setting */
-   s_con = (NMSettingConnection *) nm_setting_connection_new ();
-   uuid = nm_utils_uuid_generate ();
+   s_con = (NMSettingConnection *) nm_setting_connection_new ();
+   uuid = nm_utils_uuid_generate ();
    g_object_set (G_OBJECT (s_con),
-                 NM_SETTING_CONNECTION_UUID, uuid,
-                 NM_SETTING_CONNECTION_ID, human_name,
-                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+                 NM_SETTING_CONNECTION_UUID, uuid,
+                 NM_SETTING_CONNECTION_ID, human_name,
+                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
                  NULL);
    g_free (uuid);
-   nm_connection_add_setting (connection, NM_SETTING (s_con));
+   nm_connection_add_setting (connection, NM_SETTING (s_con));
 
    /* Add the required 'wired' setting as this is a wired connection */
-   nm_connection_add_setting (connection, nm_setting_wired_new ());
+   nm_connection_add_setting (connection, nm_setting_wired_new ());
 
    /* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */
-   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
    g_object_set (G_OBJECT (s_ip4),
-                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
                  NULL);
-   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
 
    /* Ask NetworkManager to store the connection */
    success = nm_remote_settings_add_connection (settings, connection, added_cb, loop);
@@ -725,7 +725,7 @@ not known. 

 
nm_remote_settings_add_connection ()

 
gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    NMRemoteSettingsAddConnectionFunc callback,
                                    gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
@@ -785,7 +785,7 @@ added, not the object itself

 
gboolean
 nm_remote_settings_add_connection_unsaved
                                (NMRemoteSettings *settings,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMRemoteSettingsAddConnectionFunc callback,
                                 gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 8acd02c1..ebb7e858 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -247,7 +247,7 @@ nm_secret_agent_error_quark (void
 
NMSecretAgentGetSecretsFunc ()

 
void
 (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GHashTable *secrets,
                                 GError *error,
                                 gpointer user_data);

@@ -283,13 +283,13 @@ something like this:

 NMSettingWirelessSecurity *s_wsec;
 GHashTable *secrets_hash;
 
-secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
 g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
               NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
 (call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
@@ -326,9 +326,9 @@ has returned. 

 
@@ -353,7 +353,7 @@ is the secret. 

 
NMSecretAgentSaveSecretsFunc ()

 
void
 (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError *error,
                                  gpointer user_data);

 
Called as a result of a request by NM to save secrets.  When the
@@ -400,7 +400,7 @@ has returned. 

 
NMSecretAgentDeleteSecretsFunc ()

 
void
 (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GError *error,
                                    gpointer user_data);

 
Called as a result of a request by NM to delete secrets.  When the
@@ -532,7 +532,7 @@ nm_secret_agent_get_registered (
nm_secret_agent_get_secrets ()

 
void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              const char *setting_name,
                              const char **hints,
                              NMSecretAgentGetSecretsFlags flags,
@@ -563,7 +563,7 @@ secrets from the user.

 

-
+
@@ -601,7 +601,7 @@ secrets from the user.

 
nm_secret_agent_save_secrets ()

 
void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
-                              NMConnection *connection,
+                              NMConnection *connection,
                               NMSecretAgentSaveSecretsFunc callback,
                               gpointer user_data);

 
Asyncronously ensure that all secrets inside connection
@@ -624,7 +624,7 @@ are stored to disk.

 
-
+
@@ -647,7 +647,7 @@ are stored to disk.

 
nm_secret_agent_delete_secrets ()

 
void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMSecretAgentDeleteSecretsFunc callback,
                                 gpointer user_data);

 
Asynchronously ask the agent to delete all saved secrets belonging to
@@ -670,7 +670,7 @@ nm_secret_agent_delete_secrets (
 

-
+
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 7562a519..8be2954c 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -52,7 +52,7 @@
 
+NMConnection objects to filter. 

 
@@ -306,7 +306,7 @@ returned connections will match the nsp
 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given nsp
+list of NMConnection objects that could be activated with the given nsp
 .
 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
@@ -319,7 +319,7 @@ be freed with g_slist_free() when it is no longer
 
nm_wimax_nsp_connection_valid ()

 
gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);

+                               NMConnection *connection);
 
Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 nsp
@@ -341,7 +341,7 @@ against

 
 

-
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 5df1127b..33e38b22 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,10 +15,10 @@
 

 

 
-NMState
+NMState
 
 
 nm_client_get_state ()
@@ -304,7 +304,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_get_connectivity ()
@@ -312,7 +312,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity ()
@@ -328,7 +328,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity_finish ()
@@ -861,7 +861,7 @@ or NULL if none is found. 

 
nm_client_activate_connection ()

 
void
 nm_client_activate_connection (NMClient *client,
-                               NMConnection *connection,
+                               NMConnection *connection,
                                NMDevice *device,
                                const char *specific_object,
                                NMClientActivateFn callback,
@@ -899,7 +899,7 @@ track the activation to its completion.

 

 

 
connection
 an NMConnection. 
 an NMConnection. 

 [allow-none]
 

 

 

 
partial
 an NMConnection to add; the connection may be
+
 an NMConnection to add; the connection may be
 partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
@@ -1379,7 +1379,7 @@ nm_client_get_version (
 
nm_client_get_state ()

-
NMState
+
NMState
 nm_client_get_state (NMClient *client);

 
Gets the current daemon state.

 

@@ -1399,7 +1399,7 @@ nm_client_get_state (
 
Returns

-
 the current NMState

+
 the current NMState

 

 
 

@@ -1649,7 +1649,7 @@ domains separated by ",". (NULL or an empty string
 

 

 
nm_client_get_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_get_connectivity (NMClient *client);

 
Gets the current network connectivity state. Contrast
 nm_client_check_connectivity() and
@@ -1679,7 +1679,7 @@ connectivity state first before returning any information.

 

 

 
nm_client_check_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
                               GCancellable *cancellable,
                               GError **error);

@@ -1772,7 +1772,7 @@ re-checking, and 
 
nm_client_check_connectivity_finish ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
                                      GAsyncResult *result,
                                      GError **error);

diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 7506b557..f92c1585 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -74,7 +74,7 @@
 

 

 
-NMDeviceType
+NMDeviceType
 
 
 nm_device_get_device_type ()
@@ -124,7 +124,7 @@
 

 

 
-NMDeviceCapabilities
+NMDeviceCapabilities
 
 
 nm_device_get_capabilities ()
@@ -204,7 +204,7 @@
 

 

 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state ()
@@ -212,7 +212,7 @@
 

 

 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state_reason ()
@@ -766,7 +766,7 @@ used by the device, and must not be modified.

 

 

 
nm_device_get_device_type ()

-
NMDeviceType
+
NMDeviceType
 nm_device_get_device_type (NMDevice *device);

 
Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.

 

@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.

 

 

 
nm_device_get_capabilities ()

-
NMDeviceCapabilities
+
NMDeviceCapabilities
 nm_device_get_capabilities (NMDevice *device);

 
Gets the device' capabilities.

 

@@ -1249,7 +1249,7 @@ using DHCP. 

 

 

 
nm_device_get_state ()

-
NMDeviceState
+
NMDeviceState
 nm_device_get_state (NMDevice *device);

 
Gets the current NMDevice state.

 

@@ -1275,9 +1275,9 @@ nm_device_get_state (
 
nm_device_get_state_reason ()

-
NMDeviceState
+
NMDeviceState
 nm_device_get_state_reason (NMDevice *device,
-                            NMDeviceStateReason *reason);

+                            NMDeviceStateReason *reason);

 
Gets the current NMDevice state (return value) and the reason for entering
 the state (reason
  argument).

@@ -1297,7 +1297,7 @@ the state (reason
 

 

 
reason
 location to store reason (NMDeviceStateReason), or NULL. 
 location to store reason (NMDeviceStateReason), or NULL. 

 [out][allow-none]
 

 

 
connections
 a list of NMConnection objects to filter. 
 a list of NMConnection objects to filter. 

 [element-type NMConnection]
 

 

 
connection
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 

 
connection
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 

 
-NMBluetoothCapabilities
+NMBluetoothCapabilities
 
 
 nm_device_bt_get_capabilities ()
@@ -256,7 +256,7 @@ nm_device_bt_get_name (
 
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities
+
NMBluetoothCapabilities
 nm_device_bt_get_capabilities (NMDeviceBt *device);

 
Returns the Bluetooth device's usable capabilities.

 

@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (
 

 
Returns

-
 a combination of NMBluetoothCapabilities

+
 a combination of NMBluetoothCapabilities

 

 

 
@@ -369,7 +369,7 @@ nm_device_bt_get_capabilities (
 
The “bt-capabilities” property

 
  “bt-capabilities”          guint

-
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

+
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

 
Flags: Read

 
Default value: 0

 
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 15fe2aa1..2c05df00 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -51,7 +51,7 @@
 

 

 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_modem_capabilities ()
@@ -59,7 +59,7 @@
 

 

 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_current_capabilities ()
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (void
 

 

 
nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_modem_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.

 

 

 
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_current_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index d739d92a..1c0223aa 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -74,7 +74,7 @@
 

 

 
-NM80211Mode
+NM80211Mode
 
 
 nm_device_wifi_get_mode ()
@@ -90,7 +90,7 @@
 

 

 
-NMDeviceWifiCapabilities
+NMDeviceWifiCapabilities
 
 
 nm_device_wifi_get_capabilities ()
@@ -374,7 +374,7 @@ device, and must not be modified.

 

 

 
nm_device_wifi_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_device_wifi_get_mode (NMDeviceWifi *device);

 
Gets the NMDeviceWifi mode.

 

@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (
 
nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities
 nm_device_wifi_get_capabilities (NMDeviceWifi *device);

 
Gets the Wi-Fi capabilities of the NMDeviceWifi.

 

diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index b7b318e1..edc746b6 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -288,7 +288,7 @@ nm_ip4_config_get_addresses (
 
Returns

-
 the GSList containing NMIP4Addresses.
+
 the GSList containing NMIP4Addresses.
 This is the internal copy used by the configuration and must not be modified. 

 
[element-type NMIP4Address]

 

@@ -317,7 +317,7 @@ nm_ip4_config_get_routes (
 
Returns

 
 the GSList containing
-NMIP4Routes. This is the internal copy used by the configuration,
+NMIP4Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP4Route]

 

@@ -487,7 +487,7 @@ modified. 

 

 
The “addresses” property

 
  “addresses”                gpointer

-
The GPtrArray containing NMIP4Addresses of the configuration.

+
The GPtrArray containing NMIP4Addresses of the configuration.

 
Flags: Read

 

 

diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index ed97f3e5..53718105 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -289,7 +289,7 @@ nm_ip6_config_get_addresses (
 
Returns

 
 the GSList containing
-NMIP6Addresses. This is the internal copy used by the configuration
+NMIP6Addresses. This is the internal copy used by the configuration
 and must not be modified. 

 
[element-type NMIP6Address]

 

@@ -318,7 +318,7 @@ nm_ip6_config_get_routes (
 
Returns

 
 the GSList containing
-NMIP6Routes. This is the internal copy used by the configuration,
+NMIP6Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP6Route]

 
@@ -519,7 +519,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 
The “addresses” property

 
  “addresses”                NMIP6AddressObjectArray *

 
The GPtrArray containing the IPv6 addresses;  use
-nm_utils_ip6_addresses_from_gvalue() to return a GSList of
+nm_utils_ip6_addresses_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 
@@ -552,7 +552,7 @@ contain the addresses of nameservers of the configuration.

 
The “routes” property

 
  “routes”                   NMIP6RouteObjectArray *

 
The GPtrArray containing the IPv6 routes;  use
-nm_utils_ip6_routes_from_gvalue() to return a GSList of
+nm_utils_ip6_routes_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index c099c3df..ee5bfa0c 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -229,7 +229,7 @@
 

 
Object Hierarchy

 
    GObject
-    ╰── NMConnection
+    ╰── NMConnection
         ╰── NMRemoteConnection
 

 

@@ -554,7 +554,7 @@ nm_remote_connection_get_secrets (
 

 
setting_name
the NMSetting object name to get secrets for
the NMSetting object name to get secrets for

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 
secrets

 
 the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
-created by nm_connection_to_hash() for example).  Each key in secrets
-should be the name of a NMSetting object (like "802-11-wireless-security")
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
 and each value should be a GHashTable.  The sub-hashes map string:GValue
 where the string is the setting property name (like "psk") and the value
 is the secret. 

 

 
connection
the NMConnection for which we're asked secrets
the NMConnection for which we're asked secrets

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 

 
-NMVPNConnectionState
+NMVPNConnectionState
 
 
 nm_vpn_connection_get_vpn_state ()
@@ -175,7 +175,7 @@ nm_vpn_connection_new (
 
nm_vpn_connection_get_vpn_state ()

-
NMVPNConnectionState
+
NMVPNConnectionState
 nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);

 
Gets the current NMVPNConnection state.

 

diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 91cdbfee..d473ec6c 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -297,7 +297,7 @@ returned connections will match the nsp
 

 
connections

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

 

 
connection
an NMConnection to validate against nsp
+
an NMConnection to validate against nsp
 

  
 

 

-      for libnm-glib 1.1.94
+      for libnm-glib 1.2.0
 
       The latest version of this documentation can be found on-line at
-      https://developer.gnome.org/libnm-glib/0.9/.
+      https://developer.gnome.org/libnm-glib/stable/.
     

 
Copyright © 2012-2013 The NetworkManager Authors

 

diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 5d95d5cb..984704d5 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -1,4 +1,3 @@
-
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index e0523b6f..a3f3fadc 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -57,7 +57,7 @@
 
 
 
-NMVPNServiceState
+NMVPNServiceState
 
 
 nm_vpn_plugin_get_state ()
@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (NMV
 

 

 
nm_vpn_plugin_get_state ()

-
NMVPNServiceState
+
NMVPNServiceState
 nm_vpn_plugin_get_state (NMVPNPlugin *plugin);

 

 

@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (NMVPNPlu
 
nm_vpn_plugin_set_state ()

 
void
 nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
-                         NMVPNServiceState state);

+                         NMVPNServiceState state);

 

 

 

@@ -235,7 +235,7 @@ nm_vpn_plugin_set_login_banner (N
 
nm_vpn_plugin_failure ()

 
void
 nm_vpn_plugin_failure (NMVPNPlugin *plugin,
-                       NMVPNPluginFailure reason);

+                       NMVPNPluginFailure reason);

 

 

 

diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index a4343675..cd633c5d 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -73,7 +73,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_plugin_ui_interface_import ()
@@ -262,7 +262,7 @@ nm_vpn_plugin_ui_factory (GError<
 
nm_vpn_plugin_ui_interface_ui_factory ()

 
NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
-                                       NMConnection *connection,
+                                       NMConnection *connection,
                                        GError **error);

 

 

@@ -275,7 +275,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 

 

 
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
                                    GError **error);

@@ -286,7 +286,7 @@ nm_vpn_plugin_ui_interface_import (gboolean
 nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GError **error);

 

 

@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_export (char *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection);
+ NMConnection *connection);
@@ -303,7 +303,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name 
gboolean
 nm_vpn_plugin_ui_interface_delete_connection
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);

nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.

@@ -320,7 +320,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget 
gboolean
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);
@@ -329,7 +329,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection 
gboolean
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);

nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.

diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html index b03e5987..83f198f6 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html +++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html @@ -111,11 +111,11 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

gboolean
 nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
                                       const char *secret_name,
-                                      NMSettingSecretFlags *out_flags);
+ NMSettingSecretFlags *out_flags);

Given a VPN secret key name, attempts to find the corresponding flags data item in data . If found, converts the flags data item to -NMSettingSecretFlags and returns it.

+NMSettingSecretFlags and returns it.

Parameters

diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index c6ea9297..acd89edf 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -49,7 +49,7 @@ │├──NMDHCP4Config│╰──NMDHCP6Config├──NMRemoteSettings - ├──NMConnection + ├──NMConnection│╰──NMRemoteConnection╰──NMSecretAgent diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml index 76119246..798ea5f8 100644 --- a/docs/libnm-glib/libnm-glib-docs.xml +++ b/docs/libnm-glib/libnm-glib-docs.xml @@ -10,7 +10,7 @@ for libnm-glib &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-glib/0.9/. + https://developer.gnome.org/libnm-glib/stable/. diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 85c39759..7572c017 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (char * nm_connection_get_virtual_device_description (NMConnection *connection); -

Returns the name that nm_device_disambiguate_names() would +

Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection . Eg, "VLAN (eth1.1)".

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index b50fbdbd..974ce75b 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,10 +15,10 @@

- for libnm-util 1.1.94 + for libnm-util 1.2.0 The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/.

Copyright © 2012 The NetworkManager Authors

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index d1e0be2d..c95acf87 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -1,4 +1,3 @@ - diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index b525e187..aaaadc84 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -644,7 +644,7 @@

enum NMDeviceType

NMDeviceType values indicate the type of hardware represented by -an NMDevice.

+an NMDevice.

Members

diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index 14139181..9ec760eb 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -11,7 +11,7 @@ for libnm-util &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index b1469048..2fbd6507 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -573,7 +573,7 @@ with this function.

 - @@ -583,7 +583,7 @@ filter.

Returns

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

[transfer container][element-type NMConnection]

@@ -594,7 +594,7 @@ be freed with g_ptr_array_unref() when it is no lo

nm_access_point_connection_valid ()

gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given Wi-Fi access point to ensure that the connection may be activated with that AP. The connection must match the ap @@ -617,7 +617,7 @@ against

- diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index bcd2410d..55266de2 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -374,7 +374,7 @@ nm_active_connection_get_connection (

nm_active_connection_get_id ()

const char *
 nm_active_connection_get_id (NMActiveConnection *connection);
-

Gets the NMConnection's ID.

+

Gets the NMConnection's ID.

Parameters

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against ap +

an NMConnection to validate against ap

 
@@ -392,7 +392,7 @@ nm_active_connection_get_id (

Returns

-

the ID of the NMConnection that backs the NMActiveConnection. +

the ID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -401,7 +401,7 @@ This is the internal string used by the connection, and must not be modified.

nm_active_connection_get_uuid ()

const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);
-

Gets the NMConnection's UUID.

+

Gets the NMConnection's UUID.

Parameters

@@ -419,7 +419,7 @@ nm_active_connection_get_uuid (

Returns

-

the UUID of the NMConnection that backs the NMActiveConnection. +

the UUID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -429,7 +429,7 @@ This is the internal string used by the connection, and must not be modified.

const char * nm_active_connection_get_connection_type (NMActiveConnection *connection); -

Gets the NMConnection's type.

+

Gets the NMConnection's type.

Parameters

@@ -447,7 +447,7 @@ nm_active_connection_get_connection_type

Returns

-

the type of the NMConnection that backs the NMActiveConnection. +

the type of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index 1e51c552..a990346a 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -2018,7 +2018,7 @@ any.

nm_client_activate_connection_async ()

void
 nm_client_activate_connection_async (NMClient *client,
-                                     NMConnection *connection,
+                                     NMConnection *connection,
                                      NMDevice *device,
                                      const char *specific_object,
                                      GCancellable *cancellable,
@@ -2058,7 +2058,7 @@ track the activation to its completion.
- + @@ -2147,7 +2147,7 @@ will be set. 

void
 nm_client_add_and_activate_connection_async
                                (NMClient *client,
-                                NMConnection *partial,
+                                NMConnection *partial,
                                 NMDevice *device,
                                 const char *specific_object,
                                 GCancellable *cancellable,
@@ -2178,7 +2178,7 @@ track the activation to its completion.
- - @@ -259,7 +259,7 @@ filter.

Returns

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

[transfer container][element-type NMConnection]

@@ -270,7 +270,7 @@ be freed with g_ptr_array_unref() when it is no lo

nm_wimax_nsp_connection_valid ()

gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given WiMAX NSP to ensure that the connection may be activated with that NSP. The connection must match the nsp @@ -292,7 +292,7 @@ against

 - diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index fe6ccbeb..8e4f01ca 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -8214,7 +8214,7 @@
-NMVpnEditorInterface, struct in NMVpnEditor +NMVpnEditorInterface, struct in NMVpnEditor
@@ -8282,7 +8282,7 @@
-nm_vpn_editor_get_widget, function in NMVpnEditor +nm_vpn_editor_get_widget, function in NMVpnEditor
@@ -8326,7 +8326,7 @@
-nm_vpn_editor_update_connection, function in NMVpnEditor +nm_vpn_editor_update_connection, function in NMVpnEditor
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 1267d387..eec37428 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,10 +15,10 @@

connection

an NMConnection.

an NMConnection.

[allow-none]

partial

an NMConnection to add; the connection may be +

an NMConnection to add; the connection may be partially filled (or even NULL) and will be completed by NetworkManager using the given device and specific_object @@ -2232,7 +2232,7 @@ nm_client_add_and_activate_connection_finish GError **error);

Gets the result of a call to nm_client_add_and_activate_connection_async().

You can call nm_active_connection_get_connection() on the returned -NMActiveConnection to find the path of the created NMConnection.

+NMActiveConnection to find the path of the created NMConnection.

Parameters

@@ -2556,7 +2556,7 @@ to

nm_client_add_connection_async ()

void
 nm_client_add_connection_async (NMClient *client,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 gboolean save_to_disk,
                                 GCancellable *cancellable,
                                 GAsyncReadyCallback callback,
@@ -3609,7 +3609,7 @@ regular devices and placeholder devices.

 user_function (NMClient           *client,
                NMRemoteConnection *connection,
                gpointer            user_data)
-

Notifies that a NMConnection has been added.

+

Notifies that a NMConnection has been added.

Parameters

@@ -3646,7 +3646,7 @@ user_function (NMClient *client, NMRemoteConnection *connection, gpointer user_data) -

Notifies that a NMConnection has been removed.

+

Notifies that a NMConnection has been removed.

Parameters

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 @@ - + @@ -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.
- + @@ -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
- + @@ -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

- @@ -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

- @@ -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

diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index dac135b3..48fc088c 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -795,7 +795,7 @@ nm_remote_connection_get_visible (nm_remote_connection_save() and nm_remote_connection_delete() will -always fail. (NMRemoteSettings will not normally return +always fail. (NMRemoteSettings will not normally return non-visible connections to callers, but it is possible for a connection's visibility to change after you already have a reference to it.)

@@ -865,7 +865,7 @@ to disk, FALSE if the connection is the same as its not. If the connection is not visible then it is essentially useless; it will not contain any settings, and operations such as nm_remote_connection_save() and nm_remote_connection_delete() will always -fail. (NMRemoteSettings will not normally return non-visible connections +fail. (NMRemoteSettings will not normally return non-visible connections to callers, but it is possible for a connection's visibility to change after you already have a reference to it.)

Flags: Read

diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html index c95971c3..3fb7ca3a 100644 --- a/docs/libnm/html/NMSecretAgentOld.html +++ b/docs/libnm/html/NMSecretAgentOld.html @@ -223,7 +223,7 @@

NMSecretAgentOldGetSecretsFunc ()

void
 (*NMSecretAgentOldGetSecretsFunc) (NMSecretAgentOld *agent,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GVariant *secrets,
                                    GError *error,
                                    gpointer user_data);
@@ -328,7 +328,7 @@ and the value is the secret

NMSecretAgentOldSaveSecretsFunc ()

void
 (*NMSecretAgentOldSaveSecretsFunc) (NMSecretAgentOld *agent,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     GError *error,
                                     gpointer user_data);

Called as a result of a request by NM to save secrets. When the @@ -375,7 +375,7 @@ has returned.

NMSecretAgentOldDeleteSecretsFunc ()

void
 (*NMSecretAgentOldDeleteSecretsFunc) (NMSecretAgentOld *agent,
-                                      NMConnection *connection,
+                                      NMConnection *connection,
                                       GError *error,
                                       gpointer user_data);

Called as a result of a request by NM to delete secrets. When the @@ -705,7 +705,7 @@ nm_secret_agent_old_get_registered (

nm_secret_agent_old_get_secrets ()

void
 nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  const char *setting_name,
                                  const char **hints,
                                  NMSecretAgentGetSecretsFlags flags,
@@ -736,7 +736,7 @@ secrets from the user.
- + @@ -774,7 +774,7 @@ secrets from the user.

nm_secret_agent_old_save_secrets ()

void
 nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
-                                  NMConnection *connection,
+                                  NMConnection *connection,
                                   NMSecretAgentOldSaveSecretsFunc callback,
                                   gpointer user_data);

Asynchronously ensures that all secrets inside connection @@ -797,7 +797,7 @@ disk.

 - + @@ -820,7 +820,7 @@ disk.

nm_secret_agent_old_delete_secrets ()

void
 nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     NMSecretAgentOldDeleteSecretsFunc callback,
                                     gpointer user_data);

Asynchronously asks the agent to delete all saved secrets belonging to @@ -843,7 +843,7 @@ nm_secret_agent_old_delete_secrets (

- + diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 65b56b96..1a8a870f 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -263,7 +263,7 @@

Each NMSetting contains properties that describe configuration that applies to a specific network layer (like IPv4 or IPv6 configuration) or device type (like Ethernet, or Wi-Fi). A collection of individual settings together -make up an NMConnection. Each property is strongly typed and usually has +make up an NMConnection. Each property is strongly typed and usually has a number of allowed values. See each NMSetting subclass for a description of properties and allowed values.

@@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.

nm_setting_verify ()

gboolean
 nm_setting_verify (NMSetting *setting,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    GError **error);

Validates the setting. Each setting's properties have allowed values, and some are dependent on other values (hence the need for connection @@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.

 - @@ -514,7 +514,7 @@ is being verified in isolation.

nm_setting_verify_secrets ()

gboolean
 nm_setting_verify_secrets (NMSetting *setting,
-                           NMConnection *connection,
+                           NMConnection *connection,
                            GError **error);

Verifies the secrets in the setting. The returned GError contains information about which secret of the setting @@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.

 - diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 8c845502..0cb7806e 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -484,8 +484,8 @@

Description

The NMSettingConnection object is a NMSetting subclass that describes -properties that apply to all NMConnection objects, regardless of what type -of network connection they describe. Each NMConnection object must contain +properties that apply to all NMConnection objects, regardless of what type +of network connection they describe. Each NMConnection object must contain a NMSettingConnection setting.

@@ -1757,7 +1757,7 @@ provider, or nm_utils_uuid_generate() or -nm_utils_uuid_generate_from_string().

+nm_utils_uuid_generate_from_string().

Flags: Read / Write

Default value: NULL

diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index f1975597..81cb154a 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -75,7 +75,7 @@ optional properties that apply to "generic" devices (ie, devices that NetworkManager does not specifically recognize).

There are currently no properties on this object; it exists only to be -the "connection type" setting on NMConnections for generic devices.

+the "connection type" setting on NMConnections for generic devices.

Functions

diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html index d596d39d..d6bf39e4 100644 --- a/docs/libnm/html/NMSimpleConnection.html +++ b/docs/libnm/html/NMSimpleConnection.html @@ -42,7 +42,7 @@
- + @@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (

nm_vpn_editor_plugin_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
                              GError **error);

@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (
path

-
 + @@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (

Returns

-

a new NMConnection imported from path +

a new NMConnection imported from path , or NULL on error or if the file at path was not recognized by this plugin.

@@ -316,7 +316,7 @@ was not recognized by this plugin. 

gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              GError **error);
@@ -325,24 +325,29 @@ nm_vpn_editor_plugin_export (char * nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *plugin, - NMConnection *connection); + NMConnection *connection);

nm_vpn_editor_plugin_load_from_file ()

NMVpnEditorPlugin *
-nm_vpn_editor_plugin_load_from_file (const char *plugin_filename,
+nm_vpn_editor_plugin_load_from_file (const char *plugin_name,
                                      const char *check_service,
                                      int check_owner,
                                      NMUtilsCheckFilePredicate check_file,
                                      gpointer user_data,
                                      GError **error);
-

Load the shared libary plugin_filename +

Load the shared libary plugin_name and create a new NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory function.

+

If plugin_name + is not an absolute path name, it assumes the file +is in the plugin directory of NetworkManager. In any case, the call +will do certain checks on the file before passing it to dlopen. +A consequence for that is, that you cannot omit the ".so" suffix.

-

Parameters

+

Parameters

-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

  

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

  

connections

an array of NMConnections to filter.

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 

connection

the NMConnection for which we're asked secrets

the NMConnection for which we're asked secrets

  

connection

a NMConnection

a NMConnection

  

connection

a NMConnection

a NMConnection

  

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

-NMConnection * +NMConnection * nm_simple_connection_new () @@ -50,7 +50,7 @@
-NMConnection * +NMConnection * nm_simple_connection_new_from_dbus () @@ -58,7 +58,7 @@
-NMConnection * +NMConnection * nm_simple_connection_new_clone () @@ -80,21 +80,21 @@

Functions

nm_simple_connection_new ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new (void);

 
Creates a new NMSimpleConnection object with no NMSetting objects. An
 NMSimpleConnection does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.

 

 
Returns

-
 the new empty NMConnection object. 

+
 the new empty NMConnection object. 

 
[transfer full]

nm_simple_connection_new_from_dbus ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new_from_dbus (GVariant *dict,
                                     GError **error);

 
Creates a new NMSimpleConnection from a hash table describing the
@@ -133,9 +133,9 @@ connection failed to normalize. 

 

 

 
nm_simple_connection_new_clone ()

-
NMConnection *
-nm_simple_connection_new_clone (NMConnection *connection);

-
Clones an NMConnection as an NMSimpleConnection.

+
NMConnection *
+nm_simple_connection_new_clone (NMConnection *connection);

+
Clones an NMConnection as an NMSimpleConnection.

 

 
Parameters

 

@@ -146,15 +146,15 @@ nm_simple_connection_new_clone (
connection

-
+
the NMConnection to clone
the NMConnection to clone

  
 

 

 

 

 
Returns

-
 a new NMConnection containing the same settings
-and properties as the source NMConnection. 

+
 a new NMConnection containing the same settings
+and properties as the source NMConnection. 

 
[transfer full]

 

 

diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 13cc3db2..ad04d23d 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
-NMConnection * +NMConnection * nm_vpn_editor_plugin_import () @@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (GEr

nm_vpn_editor_plugin_get_editor ()

NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Parameters

@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (

connection

the NMConnection to be edited

the NMConnection to be edited

  

full path to the file to attempt to read into a new NMConnection

full path to the file to attempt to read into a new NMConnection

  
@@ -351,14 +356,11 @@ function.

 - - + + @@ -396,7 +398,7 @@ loading the shared library.

plugin_filename

The path to the share library to load. -Apply some common heuristics to find the library, such as -appending "so" file ending. -If the path is not an absolute path or no matching module -can be found, lookup inside a directory defined at compile time. -Due to this, check_file -might be called for two different paths.

plugin_name

The path or name of the shared library to load. +The path must either be an absolute filename to an existing file. +Alternatively, it can be the name (without path) of a library in the +plugin directory of NetworkManager.

  
-

Returns

+

Returns

a new plugin instance or NULL on error.

[transfer full]

@@ -520,7 +522,7 @@ if non-NULL.

import_from_file ()

Try to import a connection from the specified path. On -success, return a partial NMConnection object. On error, return NULL and +success, return a partial NMConnection object. On error, return NULL and set error with additional information. Note that error can be NULL, in diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index ecaae0aa..6e343d65 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -249,7 +249,7 @@ connections will match the nsp

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against nsp +

an NMConnection to validate against nsp

 

- for libnm 1.1.94 + for libnm 1.2.0 The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm/1.0/. + https://developer.gnome.org/libnm/stable/.

Copyright © 2012-2014 The NetworkManager Authors

diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml index f0c50d66..9aa08657 100644 --- a/docs/libnm/html/index.sgml +++ b/docs/libnm/html/index.sgml @@ -1,4 +1,3 @@ - diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html index 852c8876..5166dcf6 100644 --- a/docs/libnm/html/libnm-NMConnection.html +++ b/docs/libnm/html/libnm-NMConnection.html @@ -548,12 +548,12 @@

Description

-

An NMConnection describes all the settings and configuration values that +

An NMConnection describes all the settings and configuration values that are necessary to configure network devices for operation on a specific network. Connections are the fundamental operating object for -NetworkManager; no device is connected without a NMConnection, or -disconnected without having been connected with a NMConnection.

-

Each NMConnection contains a list of NMSetting objects usually referenced +NetworkManager; no device is connected without a NMConnection, or +disconnected without having been connected with a NMConnection.

+

Each NMConnection contains a list of NMSetting objects usually referenced by name (using nm_connection_get_setting_by_name()) or by type (with nm_connection_get_setting()). The settings describe the actual parameters with which the network devices are configured, including device-specific @@ -565,10 +565,10 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters

nm_connection_add_setting ()

void
-nm_connection_add_setting (NMConnection *connection,
+nm_connection_add_setting (NMConnection *connection,
                            NMSetting *setting);

Adds a NMSetting to the connection, replacing any previous NMSetting of the -same name which has previously been added to the NMConnection. The +same name which has previously been added to the NMConnection. The connection takes ownership of the NMSetting object and does not increase the setting object's reference count.

@@ -582,7 +582,7 @@ the setting object's reference count.

connection

-

a NMConnection

+

a NMConnection

  @@ -598,9 +598,9 @@ the setting object's reference count.

nm_connection_remove_setting ()

void
-nm_connection_remove_setting (NMConnection *connection,
+nm_connection_remove_setting (NMConnection *connection,
                               GType setting_type);
-

Removes the NMSetting with the given GType from the NMConnection. This +

Removes the NMSetting with the given GType from the NMConnection. This operation dereferences the NMSetting object.

Parameters

@@ -613,7 +613,7 @@ operation dereferences the

connection

-

a NMConnection

+

a NMConnection

  @@ -629,10 +629,10 @@ operation dereferences the

nm_connection_get_setting ()

NMSetting *
-nm_connection_get_setting (NMConnection *connection,
+nm_connection_get_setting (NMConnection *connection,
                            GType setting_type);

Gets the NMSetting with the given GType, if one has been previously added -to the NMConnection.

+to the NMConnection.

Parameters

@@ -644,7 +644,7 @@ to the - + @@ -658,7 +658,7 @@ to the

Returns

the NMSetting, or NULL if no setting of that type was previously -added to the NMConnection.

+added to the NMConnection.

[transfer none]

@@ -666,10 +666,10 @@ added to the

nm_connection_get_setting_by_name ()

NMSetting *
-nm_connection_get_setting_by_name (NMConnection *connection,
+nm_connection_get_setting_by_name (NMConnection *connection,
                                    const char *name);

Gets the NMSetting with the given name, if one has been previously added -the NMConnection.

+the NMConnection.

Parameters

connection

a NMConnection

a NMConnection

  
@@ -681,7 +681,7 @@ the - + @@ -695,7 +695,7 @@ the

Returns

the NMSetting, or NULL if no setting with that name was previously -added to the NMConnection.

+added to the NMConnection.

[transfer none]

@@ -703,9 +703,9 @@ added to the

nm_connection_to_dbus ()

GVariant *
-nm_connection_to_dbus (NMConnection *connection,
+nm_connection_to_dbus (NMConnection *connection,
                        NMConnectionSerializationFlags flags);
-

Converts the NMConnection into a GVariant of type +

Converts the NMConnection into a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for marshalling over D-Bus or otherwise serializing.

@@ -719,7 +719,7 @@ marshalling over D-Bus or otherwise serializing.

 - + @@ -741,7 +741,7 @@ its settings, and each setting's properties.

nm_connection_replace_settings ()

gboolean
-nm_connection_replace_settings (NMConnection *connection,
+nm_connection_replace_settings (NMConnection *connection,
                                 GVariant *new_settings,
                                 GError **error);

Replaces connection @@ -760,7 +760,7 @@ need to result in a connection that passes

connection

-
 + @@ -789,8 +789,8 @@ will be unchanged).

nm_connection_replace_settings_from_connection ()

void
 nm_connection_replace_settings_from_connection
-                               (NMConnection *connection,
-                                NMConnection *new_connection);
+ (NMConnection *connection, + NMConnection *new_connection);

Deep-copies the settings of new_connection and replaces the settings of connection @@ -806,12 +806,12 @@ with the copied settings.

 - + - @@ -823,7 +823,7 @@ with

nm_connection_clear_settings ()

void
-nm_connection_clear_settings (NMConnection *connection);
+nm_connection_clear_settings (NMConnection *connection);

Deletes all of connection 's settings.

@@ -836,7 +836,7 @@ nm_connection_clear_settings (

connection

-
 +

connection

a NMConnection

a NMConnection

  

connection

the NMConnection

the NMConnection

  

a NMConnection

a NMConnection

  

connection

a NMConnection

a NMConnection

  

new_connection

a NMConnection to replace the settings of connection +

a NMConnection to replace the settings of connection with

  

a NMConnection

a NMConnection

  
@@ -846,10 +846,10 @@ nm_connection_clear_settings (

nm_connection_compare ()

gboolean
-nm_connection_compare (NMConnection *a,
-                       NMConnection *b,
+nm_connection_compare (NMConnection *a,
+                       NMConnection *b,
                        NMSettingCompareFlags flags);
-

Compares two NMConnection objects for similarity, with comparison behavior +

Compares two NMConnection objects for similarity, with comparison behavior modified by a set of flags. See nm_setting_compare() for a description of each flag's behavior.

@@ -863,12 +863,12 @@ each flag's behavior.

a

-

a NMConnection

+

a NMConnection

 

b

-

a second NMConnection to compare with the first

+

a second NMConnection to compare with the first

  @@ -888,11 +888,11 @@ each flag's behavior.

nm_connection_diff ()

gboolean
-nm_connection_diff (NMConnection *a,
-                    NMConnection *b,
+nm_connection_diff (NMConnection *a,
+                    NMConnection *b,
                     NMSettingCompareFlags flags,
                     GHashTable **out_settings);
-

Compares two NMConnection objects for similarity, with comparison behavior +

Compares two NMConnection objects for similarity, with comparison behavior modified by a set of flags. See nm_setting_compare() for a description of each flag's behavior. If the connections differ, settings and keys within each setting that differ are added to the returned out_settings @@ -909,12 +909,12 @@ No values are returned, only key names.

a

-

a NMConnection

+

a NMConnection

 

b

-

a second NMConnection to compare with the first

+

a second NMConnection to compare with the first

  @@ -943,7 +943,7 @@ not

nm_connection_verify ()

gboolean
-nm_connection_verify (NMConnection *connection,
+nm_connection_verify (NMConnection *connection,
                       GError **error);

Validates the connection and all its settings. Each setting's properties have allowed values, and some values are dependent on other values. For @@ -965,7 +965,7 @@ setting and which property failed validation, and how it failed validation.

connection

-

the NMConnection to verify

+

the NMConnection to verify

  @@ -985,7 +985,7 @@ setting and which property failed validation, and how it failed validation.

nm_connection_verify_secrets ()

gboolean
-nm_connection_verify_secrets (NMConnection *connection,
+nm_connection_verify_secrets (NMConnection *connection,
                               GError **error);

Verifies the secrets in the connection.

@@ -999,7 +999,7 @@ nm_connection_verify_secrets (

connection

-

the NMConnection to verify in

+

the NMConnection to verify in

  @@ -1020,7 +1020,7 @@ nm_connection_verify_secrets (

nm_connection_normalize ()

gboolean
-nm_connection_normalize (NMConnection *connection,
+nm_connection_normalize (NMConnection *connection,
                          GHashTable *parameters,
                          gboolean *modified,
                          GError **error);
@@ -1043,7 +1043,7 @@ cannot be normalized, the connection will not be modified.

connection

-

the NMConnection to normalize

+

the NMConnection to normalize

  @@ -1078,7 +1078,7 @@ why the connection is invalid, if the function returns an error.

nm_connection_need_secrets ()

const char *
-nm_connection_need_secrets (NMConnection *connection,
+nm_connection_need_secrets (NMConnection *connection,
                             GPtrArray **hints);

Returns the name of the first setting object in the connection which would need secrets to make a successful connection. The returned hints are only @@ -1096,7 +1096,7 @@ secrets are needed.

connection

-

the NMConnection

+

the NMConnection

  @@ -1121,7 +1121,7 @@ missing secrets

nm_connection_clear_secrets ()

void
-nm_connection_clear_secrets (NMConnection *connection);
+nm_connection_clear_secrets (NMConnection *connection);

Clears and frees any secrets that may be stored in the connection, to avoid keeping secret data in memory when not needed.

@@ -1134,7 +1134,7 @@ keeping secret data in memory when not needed.

connection

-

the NMConnection

+

the NMConnection

 
@@ -1145,7 +1145,7 @@ keeping secret data in memory when not needed.

nm_connection_clear_secrets_with_flags ()

void
 nm_connection_clear_secrets_with_flags
-                               (NMConnection *connection,
+                               (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
                                 gpointer user_data);

Clears and frees secrets determined by func @@ -1161,7 +1161,7 @@ nm_connection_clear_secrets_with_flags

connection

-

the NMConnection

+

the NMConnection

  @@ -1184,7 +1184,7 @@ specific secret should be cleared or not.

nm_connection_update_secrets ()

gboolean
-nm_connection_update_secrets (NMConnection *connection,
+nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
                               GVariant *secrets,
                               GError **error);
@@ -1192,7 +1192,7 @@ nm_connection_update_secrets (setting_name - is NULL, expects a fully serialized NMConnection as + is NULL, expects a fully serialized NMConnection as returned by nm_connection_to_dbus() and will update all secrets from all settings contained in secrets .

@@ -1207,7 +1207,7 @@ settings contained in secrets

connection

-

the NMConnection

+

the NMConnection

  @@ -1239,10 +1239,10 @@ failed (tried to update secrets for a setting that doesn't exist, etc)

nm_connection_set_path ()

void
-nm_connection_set_path (NMConnection *connection,
+nm_connection_set_path (NMConnection *connection,
                         const char *path);

Sets the D-Bus path of the connection. This property is not serialized, and -is only for the reference of the caller. Sets the “path” +is only for the reference of the caller. Sets the “path” property.

Parameters

@@ -1255,7 +1255,7 @@ property.

connection

-

the NMConnection

+

the NMConnection

  @@ -1272,7 +1272,7 @@ which provides the connection

nm_connection_get_path ()

const char *
-nm_connection_get_path (NMConnection *connection);
+nm_connection_get_path (NMConnection *connection);

Returns the connection's D-Bus path.

Parameters

@@ -1284,7 +1284,7 @@ nm_connection_get_path (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1299,7 +1299,7 @@ nm_connection_get_path (

nm_connection_get_interface_name ()

const char *
-nm_connection_get_interface_name (NMConnection *connection);
+nm_connection_get_interface_name (NMConnection *connection);

Returns the interface name as stored in NMSettingConnection:interface_name. If the connection contains no NMSettingConnection, it will return NULL.

For hardware devices and software devices created outside of NetworkManager, @@ -1315,7 +1315,7 @@ NetworkManager, this is the name of the created interface.

connection

-

The NMConnection

+

The NMConnection

 
@@ -1329,7 +1329,7 @@ NetworkManager, this is the name of the created interface.

nm_connection_is_type ()

gboolean
-nm_connection_is_type (NMConnection *connection,
+nm_connection_is_type (NMConnection *connection,
                        const char *type);

A convenience function to check if the given connection is a particular @@ -1347,7 +1347,7 @@ property of the connection and matches that against

connection

-

the NMConnection

+

the NMConnection

  @@ -1369,10 +1369,10 @@ property of the connection and matches that against

nm_connection_for_each_setting_value ()

void
-nm_connection_for_each_setting_value (NMConnection *connection,
+nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
                                       gpointer user_data);
-

Iterates over the properties of each NMSetting object in the NMConnection, +

Iterates over the properties of each NMSetting object in the NMConnection, calling the supplied user function for each property.

Parameters

@@ -1385,7 +1385,7 @@ calling the supplied user function for each property.

connection

-

the NMConnection

+

the NMConnection

  @@ -1407,7 +1407,7 @@ at each invocation

nm_connection_dump ()

void
-nm_connection_dump (NMConnection *connection);
+nm_connection_dump (NMConnection *connection);

Print the connection to stdout. For debugging purposes ONLY, should NOT be used for serialization of the connection or machine-parsed in any way. The output format is not guaranteed to be stable and may change at any time.

@@ -1421,7 +1421,7 @@ output format is not guaranteed to be stable and may change at any time.

connection

-

the NMConnection

+

the NMConnection

 
@@ -1431,7 +1431,7 @@ output format is not guaranteed to be stable and may change at any time.

nm_connection_get_uuid ()

const char *
-nm_connection_get_uuid (NMConnection *connection);
+nm_connection_get_uuid (NMConnection *connection);

A shortcut to return the UUID from the connection's NMSettingConnection.

Parameters

@@ -1443,7 +1443,7 @@ nm_connection_get_uuid (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1457,7 +1457,7 @@ nm_connection_get_uuid (

nm_connection_get_id ()

const char *
-nm_connection_get_id (NMConnection *connection);
+nm_connection_get_id (NMConnection *connection);

A shortcut to return the ID from the connection's NMSettingConnection.

Parameters

@@ -1469,7 +1469,7 @@ nm_connection_get_id (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1483,7 +1483,7 @@ nm_connection_get_id (

nm_connection_get_connection_type ()

const char *
-nm_connection_get_connection_type (NMConnection *connection);
+nm_connection_get_connection_type (NMConnection *connection);

A shortcut to return the type from the connection's NMSettingConnection.

Parameters

@@ -1495,7 +1495,7 @@ nm_connection_get_connection_type (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1509,7 +1509,7 @@ nm_connection_get_connection_type (

nm_connection_is_virtual ()

gboolean
-nm_connection_is_virtual (NMConnection *connection);
+nm_connection_is_virtual (NMConnection *connection);

Checks if connection refers to a virtual device (and thus can potentially be activated even if the device it refers to doesn't exist).

@@ -1523,7 +1523,7 @@ activated even if the device it refers to doesn't exist).

connection

-

an NMConnection

+

an NMConnection

 
@@ -1539,7 +1539,7 @@ refers to a virtual device

nm_connection_get_virtual_device_description ()

char *
 nm_connection_get_virtual_device_description
-                               (NMConnection *connection);
+ (NMConnection *connection);

Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection . @@ -1554,7 +1554,7 @@ Eg, "VLAN (eth1.1)".

connection

-

an NMConnection for a virtual device type

+

an NMConnection for a virtual device type

 
@@ -1572,7 +1572,7 @@ is not a virtual connection type.

nm_connection_get_setting_802_1x ()

NMSetting8021x *
-nm_connection_get_setting_802_1x (NMConnection *connection);
+nm_connection_get_setting_802_1x (NMConnection *connection);

A shortcut to return any NMSetting8021x the connection might contain.

Parameters

@@ -1584,7 +1584,7 @@ nm_connection_get_setting_802_1x (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1599,7 +1599,7 @@ nm_connection_get_setting_802_1x (

nm_connection_get_setting_bluetooth ()

NMSettingBluetooth *
-nm_connection_get_setting_bluetooth (NMConnection *connection);
+nm_connection_get_setting_bluetooth (NMConnection *connection);

A shortcut to return any NMSettingBluetooth the connection might contain.

Parameters

@@ -1611,7 +1611,7 @@ nm_connection_get_setting_bluetooth (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1626,7 +1626,7 @@ nm_connection_get_setting_bluetooth (

nm_connection_get_setting_bond ()

NMSettingBond *
-nm_connection_get_setting_bond (NMConnection *connection);
+nm_connection_get_setting_bond (NMConnection *connection);

A shortcut to return any NMSettingBond the connection might contain.

Parameters

@@ -1638,7 +1638,7 @@ nm_connection_get_setting_bond (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1653,7 +1653,7 @@ nm_connection_get_setting_bond (

nm_connection_get_setting_team ()

NMSettingTeam *
-nm_connection_get_setting_team (NMConnection *connection);
+nm_connection_get_setting_team (NMConnection *connection);

A shortcut to return any NMSettingTeam the connection might contain.

Parameters

@@ -1665,7 +1665,7 @@ nm_connection_get_setting_team (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1680,7 +1680,7 @@ nm_connection_get_setting_team (

nm_connection_get_setting_team_port ()

NMSettingTeamPort *
-nm_connection_get_setting_team_port (NMConnection *connection);
+nm_connection_get_setting_team_port (NMConnection *connection);

A shortcut to return any NMSettingTeamPort the connection might contain.

Parameters

@@ -1692,7 +1692,7 @@ nm_connection_get_setting_team_port (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1707,7 +1707,7 @@ nm_connection_get_setting_team_port (

nm_connection_get_setting_bridge ()

NMSettingBridge *
-nm_connection_get_setting_bridge (NMConnection *connection);
+nm_connection_get_setting_bridge (NMConnection *connection);

A shortcut to return any NMSettingBridge the connection might contain.

Parameters

@@ -1719,7 +1719,7 @@ nm_connection_get_setting_bridge (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1734,7 +1734,7 @@ nm_connection_get_setting_bridge (

nm_connection_get_setting_bridge_port ()

NMSettingBridgePort *
-nm_connection_get_setting_bridge_port (NMConnection *connection);
+nm_connection_get_setting_bridge_port (NMConnection *connection);

A shortcut to return any NMSettingBridgePort the connection might contain.

Parameters

@@ -1746,7 +1746,7 @@ nm_connection_get_setting_bridge_port (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1761,7 +1761,7 @@ nm_connection_get_setting_bridge_port (

nm_connection_get_setting_cdma ()

NMSettingCdma *
-nm_connection_get_setting_cdma (NMConnection *connection);
+nm_connection_get_setting_cdma (NMConnection *connection);

A shortcut to return any NMSettingCdma the connection might contain.

Parameters

@@ -1773,7 +1773,7 @@ nm_connection_get_setting_cdma (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1788,7 +1788,7 @@ nm_connection_get_setting_cdma (

nm_connection_get_setting_connection ()

NMSettingConnection *
-nm_connection_get_setting_connection (NMConnection *connection);
+nm_connection_get_setting_connection (NMConnection *connection);

A shortcut to return any NMSettingConnection the connection might contain.

Parameters

@@ -1800,7 +1800,7 @@ nm_connection_get_setting_connection (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1815,7 +1815,7 @@ nm_connection_get_setting_connection (

nm_connection_get_setting_dcb ()

NMSettingDcb *
-nm_connection_get_setting_dcb (NMConnection *connection);
+nm_connection_get_setting_dcb (NMConnection *connection);

A shortcut to return any NMSettingDcb the connection might contain.

Parameters

@@ -1827,7 +1827,7 @@ nm_connection_get_setting_dcb (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1842,7 +1842,7 @@ nm_connection_get_setting_dcb (

nm_connection_get_setting_generic ()

NMSettingGeneric *
-nm_connection_get_setting_generic (NMConnection *connection);
+nm_connection_get_setting_generic (NMConnection *connection);

A shortcut to return any NMSettingGeneric the connection might contain.

Parameters

@@ -1854,7 +1854,7 @@ nm_connection_get_setting_generic (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1869,7 +1869,7 @@ nm_connection_get_setting_generic (

nm_connection_get_setting_gsm ()

NMSettingGsm *
-nm_connection_get_setting_gsm (NMConnection *connection);
+nm_connection_get_setting_gsm (NMConnection *connection);

A shortcut to return any NMSettingGsm the connection might contain.

Parameters

@@ -1881,7 +1881,7 @@ nm_connection_get_setting_gsm (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1896,7 +1896,7 @@ nm_connection_get_setting_gsm (

nm_connection_get_setting_infiniband ()

NMSettingInfiniband *
-nm_connection_get_setting_infiniband (NMConnection *connection);
+nm_connection_get_setting_infiniband (NMConnection *connection);

A shortcut to return any NMSettingInfiniband the connection might contain.

Parameters

@@ -1908,7 +1908,7 @@ nm_connection_get_setting_infiniband (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1923,7 +1923,7 @@ nm_connection_get_setting_infiniband (

nm_connection_get_setting_ip_tunnel ()

NMSettingIPTunnel *
-nm_connection_get_setting_ip_tunnel (NMConnection *connection);
+nm_connection_get_setting_ip_tunnel (NMConnection *connection);

A shortcut to return any NMSettingIPTunnel the connection might contain.

Parameters

@@ -1935,7 +1935,7 @@ nm_connection_get_setting_ip_tunnel (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1951,7 +1951,7 @@ nm_connection_get_setting_ip_tunnel (

nm_connection_get_setting_ip4_config ()

NMSettingIPConfig *
-nm_connection_get_setting_ip4_config (NMConnection *connection);
+nm_connection_get_setting_ip4_config (NMConnection *connection);

A shortcut to return any NMSettingIP4Config the connection might contain.

Note that it returns the value as type NMSettingIPConfig, since the vast majority of IPv4-setting-related methods are on that type, not @@ -1966,7 +1966,7 @@ majority of IPv4-setting-related methods are on that type, not

connection

-

the NMConnection

+

the NMConnection

 
@@ -1982,7 +1982,7 @@ connection contains one, otherwise NULL.

nm_connection_get_setting_ip6_config ()

NMSettingIPConfig *
-nm_connection_get_setting_ip6_config (NMConnection *connection);
+nm_connection_get_setting_ip6_config (NMConnection *connection);

A shortcut to return any NMSettingIP6Config the connection might contain.

Note that it returns the value as type NMSettingIPConfig, since the vast majority of IPv6-setting-related methods are on that type, not @@ -1997,7 +1997,7 @@ majority of IPv6-setting-related methods are on that type, not

connection

-

the NMConnection

+

the NMConnection

 
@@ -2013,7 +2013,7 @@ connection contains one, otherwise NULL.

nm_connection_get_setting_macvlan ()

NMSettingMacvlan *
-nm_connection_get_setting_macvlan (NMConnection *connection);
+nm_connection_get_setting_macvlan (NMConnection *connection);

A shortcut to return any NMSettingMacvlan the connection might contain.

Parameters

@@ -2025,7 +2025,7 @@ nm_connection_get_setting_macvlan (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2041,7 +2041,7 @@ nm_connection_get_setting_macvlan (

nm_connection_get_setting_olpc_mesh ()

NMSettingOlpcMesh *
-nm_connection_get_setting_olpc_mesh (NMConnection *connection);
+nm_connection_get_setting_olpc_mesh (NMConnection *connection);

A shortcut to return any NMSettingOlpcMesh the connection might contain.

Parameters

@@ -2053,7 +2053,7 @@ nm_connection_get_setting_olpc_mesh (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2068,7 +2068,7 @@ nm_connection_get_setting_olpc_mesh (

nm_connection_get_setting_ppp ()

NMSettingPpp *
-nm_connection_get_setting_ppp (NMConnection *connection);
+nm_connection_get_setting_ppp (NMConnection *connection);

A shortcut to return any NMSettingPpp the connection might contain.

Parameters

@@ -2080,7 +2080,7 @@ nm_connection_get_setting_ppp (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2095,7 +2095,7 @@ nm_connection_get_setting_ppp (

nm_connection_get_setting_pppoe ()

NMSettingPppoe *
-nm_connection_get_setting_pppoe (NMConnection *connection);
+nm_connection_get_setting_pppoe (NMConnection *connection);

A shortcut to return any NMSettingPppoe the connection might contain.

Parameters

@@ -2107,7 +2107,7 @@ nm_connection_get_setting_pppoe (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2122,7 +2122,7 @@ nm_connection_get_setting_pppoe (

nm_connection_get_setting_serial ()

NMSettingSerial *
-nm_connection_get_setting_serial (NMConnection *connection);
+nm_connection_get_setting_serial (NMConnection *connection);

A shortcut to return any NMSettingSerial the connection might contain.

Parameters

@@ -2134,7 +2134,7 @@ nm_connection_get_setting_serial (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2149,7 +2149,7 @@ nm_connection_get_setting_serial (

nm_connection_get_setting_tun ()

NMSettingTun *
-nm_connection_get_setting_tun (NMConnection *connection);
+nm_connection_get_setting_tun (NMConnection *connection);

A shortcut to return any NMSettingTun the connection might contain.

Parameters

@@ -2161,7 +2161,7 @@ nm_connection_get_setting_tun (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2177,7 +2177,7 @@ nm_connection_get_setting_tun (

nm_connection_get_setting_vpn ()

NMSettingVpn *
-nm_connection_get_setting_vpn (NMConnection *connection);
+nm_connection_get_setting_vpn (NMConnection *connection);

A shortcut to return any NMSettingVpn the connection might contain.

Parameters

@@ -2189,7 +2189,7 @@ nm_connection_get_setting_vpn (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2204,7 +2204,7 @@ nm_connection_get_setting_vpn (

nm_connection_get_setting_wimax ()

NMSettingWimax *
-nm_connection_get_setting_wimax (NMConnection *connection);
+nm_connection_get_setting_wimax (NMConnection *connection);

A shortcut to return any NMSettingWimax the connection might contain.

Parameters

@@ -2216,7 +2216,7 @@ nm_connection_get_setting_wimax (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2231,7 +2231,7 @@ nm_connection_get_setting_wimax (

nm_connection_get_setting_adsl ()

NMSettingAdsl *
-nm_connection_get_setting_adsl (NMConnection *connection);
+nm_connection_get_setting_adsl (NMConnection *connection);

A shortcut to return any NMSettingAdsl the connection might contain.

Parameters

@@ -2243,7 +2243,7 @@ nm_connection_get_setting_adsl (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2258,7 +2258,7 @@ nm_connection_get_setting_adsl (

nm_connection_get_setting_wired ()

NMSettingWired *
-nm_connection_get_setting_wired (NMConnection *connection);
+nm_connection_get_setting_wired (NMConnection *connection);

A shortcut to return any NMSettingWired the connection might contain.

Parameters

@@ -2270,7 +2270,7 @@ nm_connection_get_setting_wired (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2285,7 +2285,7 @@ nm_connection_get_setting_wired (

nm_connection_get_setting_wireless ()

NMSettingWireless *
-nm_connection_get_setting_wireless (NMConnection *connection);
+nm_connection_get_setting_wireless (NMConnection *connection);

A shortcut to return any NMSettingWireless the connection might contain.

Parameters

@@ -2297,7 +2297,7 @@ nm_connection_get_setting_wireless (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2313,7 +2313,7 @@ nm_connection_get_setting_wireless (

nm_connection_get_setting_wireless_security ()

NMSettingWirelessSecurity *
 nm_connection_get_setting_wireless_security
-                               (NMConnection *connection);
+ (NMConnection *connection);

A shortcut to return any NMSettingWirelessSecurity the connection might contain.

Parameters

@@ -2325,7 +2325,7 @@ nm_connection_get_setting_wireless_security

connection

-

the NMConnection

+

the NMConnection

 
@@ -2340,7 +2340,7 @@ nm_connection_get_setting_wireless_security

nm_connection_get_setting_vlan ()

NMSettingVlan *
-nm_connection_get_setting_vlan (NMConnection *connection);
+nm_connection_get_setting_vlan (NMConnection *connection);

A shortcut to return any NMSettingVlan the connection might contain.

Parameters

@@ -2352,7 +2352,7 @@ nm_connection_get_setting_vlan (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2367,7 +2367,7 @@ nm_connection_get_setting_vlan (

nm_connection_get_setting_vxlan ()

NMSettingVxlan *
-nm_connection_get_setting_vxlan (NMConnection *connection);
+nm_connection_get_setting_vxlan (NMConnection *connection);

A shortcut to return any NMSettingVxlan the connection might contain.

Parameters

@@ -2379,7 +2379,7 @@ nm_connection_get_setting_vxlan (

connection

-

the NMConnection

+

the NMConnection

 
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index 595a766b..eee7968d 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -284,7 +284,7 @@ nm_vpn_plugin_error_quark (void

enum NMAgentManagerError

Errors returned from the secret-agent manager.

These errors may be returned from operations that could cause secrets to be -requested (such as nm_client_activate_connection()), and correspond to D-Bus +requested (such as nm_client_activate_connection()), and correspond to D-Bus errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

Members

@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

enum NMConnectionError

-

Describes errors that may result from operations involving a NMConnection +

Describes errors that may result from operations involving a NMConnection or its NMSettings.

-

These errors may be returned directly from NMConnection and NMSetting +

These errors may be returned directly from NMConnection and NMSetting methods, or may be returned from D-Bus operations (eg on NMClient or NMDevice), where they correspond to errors in the "org.freedesktop.NetworkManager.Settings.Connection" namespace.

@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_SETTING_NOT_FOUND

-

the NMConnection object +

the NMConnection object did not contain the specified NMSetting object

  @@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND

-

the NMConnection did not contain the +

the NMConnection did not contain the requested NMSetting property

  @@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_SETTING

-

the NMConnection object is missing an +

the NMConnection object is missing an NMSetting which is required for its configuration. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is missing.

@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_SETTING

-

the NMConnection object contains an +

the NMConnection object contains an invalid or inappropriate NMSetting. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is invalid.

@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because it is missing a required property. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the missing property, and "<property-name>" is @@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because a property has an invalid value. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the invalid property, and "<property-name>" is @@ -725,7 +725,7 @@ errors in that namespace.

when they encounter problems retrieving secrets on behalf of NM. They correspond to errors in the "org.freedesktop.NetworkManager.SecretManager" namespace.

-

Client APIs such as nm_client_activate_connection() will not see these error +

Client APIs such as nm_client_activate_connection() will not see these error codes; instead, the secret agent manager will translate them to the corresponding NMAgentManagerError codes.

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index 864e8463..1ae50f34 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -1091,7 +1091,7 @@ metric).

routes

-

an array of NMIP4Route objects.

+

an array of NMIP4Route objects.

[element-type NMIPRoute]
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 6629a241..fdc83666 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -10,7 +10,7 @@ for libnm &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm/1.0/. + https://developer.gnome.org/libnm/stable/. diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 -- cgit 1.3.0-6-gf8a5