From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- docs/libnm-glib/html/NMAccessPoint.html | 20 ++-- docs/libnm-glib/html/NMActiveConnection.html | 16 +-- docs/libnm-glib/html/NMClient.html | 81 +++++++++----- docs/libnm-glib/html/NMDevice.html | 123 +++++++++++++++++---- docs/libnm-glib/html/NMDeviceBond.html | 2 +- docs/libnm-glib/html/NMDeviceBridge.html | 2 +- docs/libnm-glib/html/NMDeviceBt.html | 8 +- docs/libnm-glib/html/NMDeviceModem.html | 8 +- docs/libnm-glib/html/NMDeviceTeam.html | 2 +- docs/libnm-glib/html/NMDeviceVlan.html | 44 ++++++++ docs/libnm-glib/html/NMDeviceWifi.html | 10 +- docs/libnm-glib/html/NMDeviceWimax.html | 2 +- docs/libnm-glib/html/NMIP4Config.html | 4 +- docs/libnm-glib/html/NMIP6Config.html | 4 +- docs/libnm-glib/html/NMObject.html | 4 +- docs/libnm-glib/html/NMRemoteConnection.html | 10 +- docs/libnm-glib/html/NMRemoteSettings.html | 42 ++++--- docs/libnm-glib/html/NMSecretAgent.html | 10 +- docs/libnm-glib/html/NMWimaxNsp.html | 13 ++- docs/libnm-glib/html/api-index-full.html | 24 ++++ docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 8 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 6 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 8 +- 24 files changed, 327 insertions(+), 126 deletions(-) (limited to 'docs/libnm-glib/html') diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 7c72487c..97ae9c96 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -57,13 +57,13 @@ NMAccessPointClass; GObject * nm_access_point_new (DBusGConnection *connection, const char *path); -NM80211ApFlags nm_access_point_get_flags (NMAccessPoint *ap); -NM80211ApSecurityFlags nm_access_point_get_wpa_flags (NMAccessPoint *ap); -NM80211ApSecurityFlags nm_access_point_get_rsn_flags (NMAccessPoint *ap); +NM80211ApFlags nm_access_point_get_flags (NMAccessPoint *ap); +NM80211ApSecurityFlags nm_access_point_get_wpa_flags (NMAccessPoint *ap); +NM80211ApSecurityFlags nm_access_point_get_rsn_flags (NMAccessPoint *ap); const GByteArray * nm_access_point_get_ssid (NMAccessPoint *ap); const char * nm_access_point_get_bssid (NMAccessPoint *ap); guint32 nm_access_point_get_frequency (NMAccessPoint *ap); -NM80211Mode nm_access_point_get_mode (NMAccessPoint *ap); +NM80211Mode nm_access_point_get_mode (NMAccessPoint *ap); guint32 nm_access_point_get_max_bitrate (NMAccessPoint *ap); guint8 nm_access_point_get_strength (NMAccessPoint *ap); GSList * nm_access_point_filter_connections (NMAccessPoint *ap, @@ -247,7 +247,7 @@ Creates a new

nm_access_point_get_flags ()

-
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
+
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

Gets the flags of the access point.

@@ -272,7 +272,7 @@ Gets the flags of the access point.

nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
+
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

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

@@ -297,7 +297,7 @@ Gets the WPA (version 1) flags of the access point.

nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);
+
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access point. @@ -400,7 +400,7 @@ Gets the frequency of the access point.

nm_access_point_get_mode ()

-
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);
+
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);

Gets the mode of the access point.

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

connections :

a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] +NMConnection objects to filter. [element-type NMConnection] @@ -511,7 +511,7 @@ filter that list with this function. 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 -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NMConnection] diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index 0e8471d5..961428e2 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -70,7 +70,7 @@ const char * char * nm_active_connection_get_specific_object (NMActiveConnection *connection); const GPtrArray * nm_active_connection_get_devices (NMActiveConnection *connection); -NMActiveConnectionState nm_active_connection_get_state (NMActiveConnection *connection); +NMActiveConnectionState nm_active_connection_get_state (NMActiveConnection *connection); const char * nm_active_connection_get_master (NMActiveConnection *connection); gboolean nm_active_connection_get_default (NMActiveConnection *connection); NMIP4Config * nm_active_connection_get_ip4_config (NMActiveConnection *connection); @@ -458,7 +458,7 @@ Gets the NMDevices used fo

Returns :

the GPtrArray containing NMDevices. -This is the internal copy used by the connection, and must not be modified. [element-type NMClient.Device] +This is the internal copy used by the connection, and must not be modified. [element-type NMDevice] @@ -467,7 +467,7 @@ This is the internal copy used by the connection, and must not be modified.

nm_active_connection_get_state ()

-
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
+
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

Gets the active connection's state.

@@ -563,7 +563,7 @@ Gets the current

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] @@ -595,7 +595,7 @@ Gets the current

Returns :

the NMDHCP4Config, or NULL if the connection does not use DHCP, or is not in the -NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. [transfer none] +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. [transfer none] @@ -650,7 +650,7 @@ Gets the current

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] @@ -682,7 +682,7 @@ Gets the current

Returns :

the NMDHCP6Config, or NULL if the connection does not use DHCPv6, or is not in the -NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. [transfer none] +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. [transfer none] @@ -749,7 +749,7 @@ Whether the active connection is the default IPv6 one.

The "devices" property

  "devices"                  NMObjectArray*        : Read
-

Devices.

+

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 67de2786..b28d9ed5 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -121,7 +121,7 @@ const gboolean nm_client_wimax_hardware_get_enabled (NMClient *client); const char * nm_client_get_version (NMClient *client); -NMState nm_client_get_state (NMClient *client); +NMState nm_client_get_state (NMClient *client); gboolean nm_client_get_startup (NMClient *client); gboolean nm_client_get_manager_running (NMClient *client); const GPtrArray * nm_client_get_active_connections (NMClient *client); @@ -138,15 +138,15 @@ const const char *level, const char *domains, GError **error); -NMConnectivityState nm_client_get_connectivity (NMClient *client); -NMConnectivityState nm_client_check_connectivity (NMClient *client, +NMConnectivityState nm_client_get_connectivity (NMClient *client); +NMConnectivityState nm_client_check_connectivity (NMClient *client, GCancellable *cancellable, GError **error); void nm_client_check_connectivity_async (NMClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -NMConnectivityState nm_client_check_connectivity_finish (NMClient *client, +NMConnectivityState nm_client_check_connectivity_finish (NMClient *client, GAsyncResult *result, GError **error); NMActiveConnection * nm_client_get_primary_connection (NMClient *client); @@ -680,9 +680,9 @@ Gets the result of an const GPtrArray * nm_client_get_devices (NMClient *client);

Gets all the known network devices. Use nm_device_get_type() or the -NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the -returned array is, and then you may use device-specific methods such as -nm_device_ethernet_get_hw_address(). +NM_IS_DEVICE_XXXX functions to determine what kind of +device member of the returned array is, and then you may use device-specific +methods such as nm_device_ethernet_get_hw_address().

@@ -699,7 +699,7 @@ returned array is, and then you may use device-specific methods such as @@ -799,6 +799,12 @@ determine which network to connect to given the settings in connection is not given for a device-based activation, NetworkManager picks the best available connection for the device and activates it.

+

+Note that the callback is invoked when NetworkManager has started activating +the new connection, not when it finishes. You can used the returned +NMActiveConnection object (in particular, "state") to +track the activation to its completion. +

Returns :

 a GPtrArray containing all the NMDevices. The returned array is owned by the -NMClient object and should not be modified. [transfer none][element-type NMClient.Device] +NMClient object and should not be modified. [transfer none][element-type NMDevice]
@@ -871,6 +877,12 @@ automatically filling in missing settings with the capabilities of the given device and specific object. The new connection is then activated. Cannot be used for VPN connections at this time.

+

+Note that the callback is invoked when NetworkManager has started activating +the new connection, not when it finishes. You can used the returned +NMActiveConnection object (in particular, "state") to +track the activation to its completion. +

@@ -1266,7 +1278,7 @@ Gets NetworkManager version.

nm_client_get_state ()

-
NMState             nm_client_get_state                 (NMClient *client);
+
NMState             nm_client_get_state                 (NMClient *client);

Gets the current daemon state.

@@ -1283,7 +1295,7 @@ Gets the current daemon state.
- @@ -1364,7 +1376,7 @@ Gets the active connections. @@ -1526,7 +1538,7 @@ domains separated by ",". (

nm_client_get_connectivity ()

-
NMConnectivityState nm_client_get_connectivity          (NMClient *client);
+
NMConnectivityState nm_client_get_connectivity          (NMClient *client);

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

nm_client_check_connectivity ()

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

 

@@ -1640,7 +1652,7 @@ re-checking, and 
 
nm_client_check_connectivity_finish ()

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

 

@@ -1763,7 +1775,10 @@ likely to become the new 
 
The "active-connections" property

 
  "active-connections"       NMObjectArray*        : Read

-
Active connections.

+

+The active connections.
+Type: GLib.PtrArray
+
@@ -1789,14 +1804,18 @@ List of known network devices.

The "manager-running" property

  "manager-running"          gboolean              : Read
-

Whether NetworkManager is running.

+

+Whether the daemon is running. +

Default value: FALSE

The "networking-enabled" property

  "networking-enabled"       gboolean              : Read / Write
-

Is networking enabled.

+

+Whether networking is enabled. +

Default value: TRUE

@@ -1842,42 +1861,54 @@ The NetworkManager version.

The "wimax-enabled" property

  "wimax-enabled"            gboolean              : Read / Write
-

Is WiMAX enabled.

+

+Whether WiMAX functionality is enabled. +

Default value: FALSE

The "wimax-hardware-enabled" property

  "wimax-hardware-enabled"   gboolean              : Read
-

Is WiMAX hardware enabled.

+

+Whether the WiMAX hardware is enabled. +

Default value: FALSE

The "wireless-enabled" property

  "wireless-enabled"         gboolean              : Read / Write
-

Is wireless enabled.

+

+Whether wireless is enabled. +

Default value: FALSE

The "wireless-hardware-enabled" property

  "wireless-hardware-enabled" gboolean              : Read
-

Is wireless hardware enabled.

+

+Whether the wireless hardware is enabled. +

Default value: TRUE

The "wwan-enabled" property

  "wwan-enabled"             gboolean              : Read / Write
-

Is WWAN enabled.

+

+Whether WWAN functionality is enabled. +

Default value: FALSE

The "wwan-hardware-enabled" property

  "wwan-hardware-enabled"    gboolean              : Read
-

Is WWAN hardware enabled.

+

+Whether the WWAN hardware is enabled. +

Default value: FALSE

@@ -1903,7 +1934,7 @@ Notifies that a - @@ -1934,7 +1965,7 @@ Notifies that a - diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index ad4e490b..c34214d5 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -77,14 +77,14 @@ const char *path); const char * nm_device_get_iface (NMDevice *device); const char * nm_device_get_ip_iface (NMDevice *device); -NMDeviceTypenm_device_get_device_type (NMDevice *device); +NMDeviceTypenm_device_get_device_type (NMDevice *device); const char * nm_device_get_udi (NMDevice *device); const char * nm_device_get_driver (NMDevice *device); const char * nm_device_get_driver_version (NMDevice *device); const char * nm_device_get_firmware_version (NMDevice *device); const char * nm_device_get_type_description (NMDevice *device); const char * nm_device_get_hw_address (NMDevice *device); -NMDeviceCapabilitiesnm_device_get_capabilities (NMDevice *device); +NMDeviceCapabilitiesnm_device_get_capabilities (NMDevice *device); gbooleannm_device_get_managed (NMDevice *device); gbooleannm_device_get_autoconnect (NMDevice *device); voidnm_device_set_autoconnect (NMDevice *device, @@ -94,23 +94,27 @@ const char * NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); NMIP6Config * nm_device_get_ip6_config (NMDevice *device); NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); -NMDeviceStatenm_device_get_state (NMDevice *device); -NMDeviceStatenm_device_get_state_reason (NMDevice *device, - NMDeviceStateReason *reason); +NMDeviceStatenm_device_get_state (NMDevice *device); +NMDeviceStatenm_device_get_state_reason (NMDevice *device, + NMDeviceStateReason *reason); NMActiveConnection * nm_device_get_active_connection (NMDevice *device); const GPtrArray * nm_device_get_available_connections (NMDevice *device); const char * nm_device_get_physical_port_id (NMDevice *device); guint32nm_device_get_mtu (NMDevice *device); +gbooleannm_device_is_software (NMDevice *device); const char * nm_device_get_product (NMDevice *device); const char * nm_device_get_vendor (NMDevice *device); const char * nm_device_get_description (NMDevice *device); char ** nm_device_disambiguate_names (NMDevice **devices, int num_devices); -void (*NMDeviceDeactivateFn) (NMDevice *device, +void (*NMDeviceCallbackFn) (NMDevice *device, GError *error, gpointer user_data); voidnm_device_disconnect (NMDevice *device, - NMDeviceDeactivateFn callback, + NMDeviceCallbackFn callback, + gpointer user_data); +voidnm_device_delete (NMDevice *device, + NMDeviceCallbackFn callback, gpointer user_data); GSList * nm_device_filter_connections (NMDevice *device, const GSList *connections); @@ -120,6 +124,9 @@ const char * NMConnection *connection, GError **error); GTypenm_device_get_setting_type (NMDevice *device); +void (*NMDeviceDeactivateFn) (NMDevice *device, + GError *error, + gpointer user_data);
@@ -552,7 +559,7 @@ used by the device, and must not be modified.

nm_device_get_device_type ()

-
NMDeviceType        nm_device_get_device_type           (NMDevice *device);
+
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

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

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

nm_device_get_capabilities ()

-
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
+
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

Gets the device' capabilities.

@@ -995,7 +1002,7 @@ using DHCP. [

nm_device_get_state ()

-
NMDeviceState       nm_device_get_state                 (NMDevice *device);
+
NMDeviceState       nm_device_get_state                 (NMDevice *device);

Gets the current NMDevice state.

@@ -1020,8 +1027,8 @@ Gets the current

nm_device_get_state_reason ()

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

Gets the current NMDevice state (return value) and the reason for entering the state (reason argument). @@ -1039,7 +1046,7 @@ the state (reason argument).

- @@ -1099,7 +1106,7 @@ be activated on device. @@ -1165,6 +1172,33 @@ Gets the MTU of the
+

nm_device_is_software ()

+
gboolean            nm_device_is_software               (NMDevice *device);
+

+Whether the device is a software device. +

+

Returns :

the current NMState +the current NMState

Returns :

 a GPtrArray containing all the active NMActiveConnections. -The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.ActiveConnection] +The returned array is owned by the client and should not be modified. [transfer none][element-type NMActiveConnection]

device :

the new device. [type NMClient.Device] +the new device. [type NMDevice]

device :

the removed device. [type NMClient.Device] +the removed device. [type NMDevice]

reason :

location to store reason (NMDeviceStateReason), or NULL. [out][allow-none] +location to store reason (NMDeviceStateReason), or NULL. [out][allow-none]

Returns :

 the GPtrArray containing NMRemoteConnections. This is the internal copy used by -the connection, and must not be modified. [element-type NMClient.RemoteConnection] +the connection, and must not be modified. [element-type NMRemoteConnection]
++++ + + + + + + + + + + +

device :

a NMDevice +

Returns :

 +TRUE if device is a software device, FALSE if it is a hardware device.
+

Since 1.0

+
+
+

nm_device_get_product ()

const char *        nm_device_get_product               (NMDevice *device);

@@ -1220,8 +1254,7 @@ device, and must not be modified.

nm_device_get_description ()

const char *        nm_device_get_description           (NMDevice *device);

-Gets a description of device, incorporating the results of -nm_device_get_short_vendor() and nm_device_get_short_product(). +Gets a description of device, based on its vendor and product names.

@@ -1279,8 +1312,8 @@ devices in devices.
-

NMDeviceDeactivateFn ()

-
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
+
NMDeviceCallbackFn ()

+
void                (*NMDeviceCallbackFn)               (NMDevice *device,
                                                          GError *error,
                                                          gpointer user_data);

 

@@ -1290,7 +1323,7 @@ devices in devices.
 

 
nm_device_disconnect ()

 
void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
+                                                         NMDeviceCallbackFn callback,
                                                          gpointer user_data);

 

 Disconnects the device if currently connected, and prevents the device from
@@ -1324,6 +1357,41 @@ operation completes. [
+
nm_device_delete ()

+
void                nm_device_delete                    (NMDevice *device,
+                                                         NMDeviceCallbackFn callback,
+                                                         gpointer user_data);

+

+Deletes the software device. Hardware devices can't be deleted.
+

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

device :

a NMDevice +

callback :

callback to be called when delete +operation completes. [scope async][allow-none] +

user_data :

caller-specific data passed to callback. [closure] +
+

Since 1.0

+
+
+

nm_device_filter_connections ()

GSList *            nm_device_filter_connections        (NMDevice *device,
                                                          const GSList *connections);
@@ -1349,7 +1417,7 @@ incompatible with the device. To get the full list of connections see

connections :

-a list of NMConnection objects to filter. [element-type NetworkManager.Connection] +a list of NMConnection objects to filter. [element-type NMConnection] @@ -1358,7 +1426,7 @@ incompatible with the device. To get the full list of connections see list of NMConnection objects that could be activated with the given device. The elements of the list are owned by their creator and should not be freed by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NMConnection] @@ -1456,7 +1524,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.

@@ -1473,12 +1541,21 @@ that can be used on device. +device's associated NMSetting type

Returns :

 -device's associated NMSetting type

Since 0.9.10

+
+
+

NMDeviceDeactivateFn ()

+
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
+                                                         GError *error,
+                                                         gpointer user_data);
+

+

+

Property Details

diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 9a502587..6a708b0b 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -306,7 +306,7 @@ Gets the devices currently slaved to device

Returns :

the GPtrArray containing NMDevices that are slaves of device. This is the internal -copy used by the device, and must not be modified. [element-type NMClient.Device] +copy used by the device, and must not be modified. [element-type NMDevice] diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html index 2b7594ad..e2bb740c 100644 --- a/docs/libnm-glib/html/NMDeviceBridge.html +++ b/docs/libnm-glib/html/NMDeviceBridge.html @@ -311,7 +311,7 @@ Gets the devices currently slaved to device

Returns :

the GPtrArray containing NMDevices that are slaves of device. This is the internal -copy used by the device, and must not be modified. [element-type NMClient.Device] +copy used by the device, and must not be modified. [element-type NMDevice] diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html index e3a59fc7..c3a5325a 100644 --- a/docs/libnm-glib/html/NMDeviceBt.html +++ b/docs/libnm-glib/html/NMDeviceBt.html @@ -55,7 +55,7 @@ const char *path); const char * nm_device_bt_get_hw_address (NMDeviceBt *device); const char * nm_device_bt_get_name (NMDeviceBt *device); -NMBluetoothCapabilities nm_device_bt_get_capabilities (NMDeviceBt *device); +NMBluetoothCapabilities nm_device_bt_get_capabilities (NMDeviceBt *device);
@@ -298,7 +298,7 @@ Gets the name of the <

nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);
+
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

Returns the Bluetooth device's usable capabilities.

@@ -315,7 +315,7 @@ Returns the Bluetooth device's usable capabilities.

Returns :

-a combination of NMBluetoothCapabilities +a combination of NMBluetoothCapabilities @@ -328,7 +328,7 @@ Returns the Bluetooth device's usable capabilities.

The "bt-capabilities" property

  "bt-capabilities"          guint                 : Read

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

Default value: 0

diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html index d5fb1cdf..1399158e 100644 --- a/docs/libnm-glib/html/NMDeviceModem.html +++ b/docs/libnm-glib/html/NMDeviceModem.html @@ -50,9 +50,9 @@ #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES NMDeviceModem; NMDeviceModemClass; -NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities +NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities (NMDeviceModem *self); -NMDeviceModemCapabilities nm_device_modem_get_current_capabilities +NMDeviceModemCapabilities nm_device_modem_get_current_capabilities (NMDeviceModem *self);
@@ -193,7 +193,7 @@ Registers an error quark for

nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
+
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
                                                         (NMDeviceModem *self);

 

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

 

 
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
+
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/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 4557c4b9..9160805e 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -310,7 +310,7 @@ Gets the devices currently enslaved to device
 
Returns :

 the GPtrArray containing
 NMDevices that are slaves of device. This is the internal
-copy used by the device, and must not be modified. [element-type NMClient.Device]
+copy used by the device, and must not be modified. [element-type NMDevice]
 
 
 
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index 89e4a9ce..48198bf6 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -48,6 +48,7 @@
 GQuark              nm_device_vlan_error_quark          (void);
 #define             NM_DEVICE_VLAN_HW_ADDRESS
 #define             NM_DEVICE_VLAN_CARRIER
+#define             NM_DEVICE_VLAN_PARENT
 #define             NM_DEVICE_VLAN_VLAN_ID
                     NMDeviceVlan;
                     NMDeviceVlanClass;
@@ -55,6 +56,7 @@
                                                          const char *path);
 const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);
 gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);
+NMDevice *          nm_device_vlan_get_parent           (NMDeviceVlan *device);
 guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);
 

 

@@ -78,6 +80,7 @@ NMDeviceVlan implements
 
   "carrier"                  gboolean              : Read
   "hw-address"               gchar*                : Read
+  "parent"                   NMDevice*             : Read
   "vlan-id"                  guint                 : Read
@@ -182,6 +185,14 @@ Registers an error quark for +

NM_DEVICE_VLAN_PARENT

+
#define NM_DEVICE_VLAN_PARENT      "parent"
+
+

+

+
+
+

NM_DEVICE_VLAN_VLAN_ID

#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
@@ -298,6 +309,30 @@ Whether the device has carrier.
+

nm_device_vlan_get_parent ()

+
NMDevice *          nm_device_vlan_get_parent           (NMDeviceVlan *device);
+
++++ + + + + + + + + + + +

device :

a NMDeviceVlan +

Returns :

the device's parent device. [transfer none] +
+

Since 1.0

+
+
+

nm_device_vlan_get_vlan_id ()

guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);
@@ -340,6 +375,15 @@ The hardware (MAC) address of the device.
+

The "parent" property

+
  "parent"                   NMDevice*             : Read
+

+The devices's parent device. +

+

Since 1.0

+
+
+

The "vlan-id" property

  "vlan-id"                  guint                 : Read

diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index 63492658..7a9a27df 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -62,9 +62,9 @@ const char * nm_device_wifi_get_hw_address (NMDeviceWifi *device); const char * nm_device_wifi_get_permanent_hw_address (NMDeviceWifi *device); -NM80211Mode nm_device_wifi_get_mode (NMDeviceWifi *device); +NM80211Mode nm_device_wifi_get_mode (NMDeviceWifi *device); guint32 nm_device_wifi_get_bitrate (NMDeviceWifi *device); -NMDeviceWifiCapabilities nm_device_wifi_get_capabilities +NMDeviceWifiCapabilities nm_device_wifi_get_capabilities (NMDeviceWifi *device); NMAccessPoint * nm_device_wifi_get_active_access_point (NMDeviceWifi *device); @@ -377,7 +377,7 @@ device, and must not be modified.

nm_device_wifi_get_mode ()

-
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
+
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

Gets the NMDeviceWifi mode.

@@ -427,7 +427,7 @@ Gets the bit rate of the

nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
+
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
                                                         (NMDeviceWifi *device);

 

 Gets the Wi-Fi capabilities of the NMDeviceWifi.
@@ -531,7 +531,7 @@ Gets all the scanned access points of the Returns :
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index 60e44b58..e082543e 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -406,7 +406,7 @@ Gets all the scanned NSPs of the

Returns :

 diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html index ca30a7b2..6396397d 100644 --- a/docs/libnm-glib/html/NMIP4Config.html +++ b/docs/libnm-glib/html/NMIP4Config.html @@ -254,7 +254,7 @@ Gets the IP4 addresses (containing the address, prefix, and gateway). @@ -282,7 +282,7 @@ Gets the routes. diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html index 9f0865a2..d923c6f7 100644 --- a/docs/libnm-glib/html/NMIP6Config.html +++ b/docs/libnm-glib/html/NMIP6Config.html @@ -247,7 +247,7 @@ Gets the IP6 addresses (containing the address, prefix, and gateway). @@ -275,7 +275,7 @@ Gets the routes. diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html index 99b05001..cedff8ee 100644 --- a/docs/libnm-glib/html/NMObject.html +++ b/docs/libnm-glib/html/NMObject.html @@ -261,13 +261,13 @@ device, and must not be modified.

The "dbus-connection" property

  "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only
-

Connection.

+

The "dbus-path" property

  "dbus-path"                gchar*                : Read / Write / Construct Only
-

DBus Object Path.

+

Default value: NULL

diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index a5d9e214..848c1910 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -511,7 +511,7 @@ Request the connection's secrets. - + @@ -559,19 +559,21 @@ representation.

The "bus" property

  "bus"                      DBusGConnection*      : Write / Construct Only
-

DBusGConnection.

+

+The DBusGConnection that the NMRemoteConnection is connected to. +

The "dbus-connection" property

  "dbus-connection"          DBusGConnection*      : Write / Construct Only
-

DBusGConnection.

+

The "dbus-path" property

  "dbus-path"                gchar*                : Write / Construct Only
-

DBus Object Path.

+

Default value: NULL

diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index fe7118c8..41fdcb75 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -233,7 +233,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 */ } @@ -251,25 +251,25 @@ the stored object known to NetworkManager. 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); @@ -597,7 +597,7 @@ list containing all connections provided by the remote settings service. Each element of the returned list is a NMRemoteConnection instance, which is owned by the NMRemoteSettings object and should not be freed by the caller. The returned list is, however, owned by the caller and should be freed -using g_slist_free() when no longer required. [transfer container][element-type NMClient.RemoteConnection] +using g_slist_free() when no longer required. [transfer container][element-type NMRemoteConnection] @@ -952,27 +952,37 @@ hostname operation completes. [

The "bus" property

  "bus"                      DBusGConnection*      : Read / Write / Construct Only
-

DBusGConnection.

+

+The DBusGConnection that the NMRemoteSettings is connected to. Defaults +to the system bus if not specified. +

The "can-modify" property

  "can-modify"               gboolean              : Read
-

Can modify anything (hostname, connections, etc).

+

+If TRUE, adding and modifying connections is supported. +

Default value: FALSE

The "hostname" property

  "hostname"                 gchar*                : Read
-

Persistent hostname.

+

+The machine hostname stored in persistent configuration. This can be +modified by calling nm_remote_settings_save_hostname(). +

Default value: NULL

The "service-running" property

  "service-running"          gboolean              : Read
-

Is service running.

+

+Whether the settings service is running. +

Default value: FALSE

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 2aee97d9..feeaf82e 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -219,7 +219,7 @@ when they encounter problems retrieving secrets on behalf of NM. @@ -376,11 +376,11 @@ something like this: GHashTable *secrets_hash;secrets = nm_connection_new (); -s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_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)); +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) @@ -418,7 +418,7 @@ has returned. [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") +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. [element-type utf8 GLib.HashTable] diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index 736d56fd..ea7536cf 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -123,6 +123,7 @@ NMWimaxNsp implements } NMWimaxNspNetworkType;

+WiMAX network type.

a GPtrArray containing all the scanned NMAccessPoints. -The returned array is owned by the client and should not be modified. [element-type NMClient.AccessPoint] +The returned array is owned by the client and should not be modified. [element-type NMAccessPoint]
a GPtrArray containing all the scanned NMWimaxNsps. -The returned array is owned by the client and should not be modified. [element-type NMClient.WimaxNsp] +The returned array is owned by the client and should not be modified. [element-type NMWimaxNsp]

Returns :

 the GSList containing NMIP4Addresses. -This is the internal copy used by the configuration and must not be modified. [element-type NetworkManager.IP4Address] +This is the internal copy used by the configuration and must not be modified. [element-type NMIP4Address]

Returns :

 the GSList containing NMIP4Routes. This is the internal copy used by the configuration, -and must not be modified. [element-type NetworkManager.IP4Route] +and must not be modified. [element-type NMIP4Route]

Returns :

 the GSList containing NMIP6Addresses. This is the internal copy used by the configuration -and must not be modified. [element-type NetworkManager.IP6Address] +and must not be modified. [element-type NMIP6Address]

Returns :

 the GSList containing NMIP6Routes. This is the internal copy used by the configuration, -and must not be modified. [element-type NetworkManager.IP6Route] +and must not be modified. [element-type NMIP6Route]

setting_name :

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

callback :

NM_SECRET_AGENT_CAPABILITY_VPN_HINTS

 the agent supports sending hints given -by the NMSecretAgentClass::get_secrets() class method to VPN plugin +by the get_secrets class method to VPN plugin authentication dialogs.
@@ -132,22 +133,22 @@ NMWimaxNsp implements - - - - @@ -307,7 +308,7 @@ returned connections will match the nsp' @@ -316,7 +317,7 @@ returned connections will match the 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 -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NMConnection] diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index b576616e..e52c73aa 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -883,6 +883,10 @@
+NMDeviceCallbackFn, user_function in NMDevice +
+
+
NMDeviceClass, struct in NMDevice
@@ -1043,6 +1047,10 @@
+NMDeviceVlan:parent, object property in NMDeviceVlan +
+
+
NMDeviceVlan:vlan-id, object property in NMDeviceVlan
@@ -1311,6 +1319,10 @@
+nm_device_delete, function in NMDevice +
+
+
NM_DEVICE_DEVICE_TYPE, macro in NMDevice
@@ -1579,6 +1591,10 @@
+nm_device_is_software, function in NMDevice +
+
+
NM_DEVICE_MANAGED, macro in NMDevice
@@ -1735,6 +1751,10 @@
+nm_device_vlan_get_parent, function in NMDeviceVlan +
+
+
nm_device_vlan_get_vlan_id, function in NMDeviceVlan
@@ -1747,6 +1767,10 @@
+NM_DEVICE_VLAN_PARENT, macro in NMDeviceVlan +
+
+
NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 588c303c..9434f44e 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,7 +15,7 @@

NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

 +unknown network type

NM_WIMAX_NSP_NETWORK_TYPE_HOME

 +home network

NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

 +partner network

NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

 +roaming partner network

connections :

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

- for libnm-glib 0.9.10.0 + for libnm-glib 1.0.0 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-glib/0.9/. diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 5aab1ec1..4dca87c8 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -226,16 +226,19 @@ + - + + + @@ -608,16 +611,19 @@ + + + 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 0d883d08..7a2098f6 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 @@ -44,7 +44,7 @@ gboolean nm_vpn_plugin_utils_get_secret_flags (GHashTable *data, const char *secret_name, - NMSettingSecretFlags *out_flags); + NMSettingSecretFlags *out_flags);

@@ -100,11 +100,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.

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index f552f3e1..c9ec066a 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -221,16 +221,19 @@ + - + + + @@ -446,15 +449,18 @@ + + + -- cgit 1.3.0-6-gf8a5