From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- docs/libnm-glib/html/NMAccessPoint.html | 38 +++ docs/libnm-glib/html/NMActiveConnection.html | 61 ++++ docs/libnm-glib/html/NMClient.html | 93 +++++- docs/libnm-glib/html/NMDHCP4Config.html | 8 + docs/libnm-glib/html/NMDHCP6Config.html | 8 + docs/libnm-glib/html/NMDevice.html | 73 ++++- docs/libnm-glib/html/NMDeviceBt.html | 8 + docs/libnm-glib/html/NMDeviceEthernet.html | 8 + docs/libnm-glib/html/NMDeviceModem.html | 8 + docs/libnm-glib/html/NMDeviceWifi.html | 8 + docs/libnm-glib/html/NMDeviceWimax.html | 8 + docs/libnm-glib/html/NMIP4Config.html | 8 + docs/libnm-glib/html/NMIP6Config.html | 8 + docs/libnm-glib/html/NMObject.html | 8 + docs/libnm-glib/html/NMRemoteConnection.html | 17 +- docs/libnm-glib/html/NMRemoteSettings.html | 100 +++++- docs/libnm-glib/html/NMSecretAgent.html | 171 ++++++++++- docs/libnm-glib/html/NMVPNConnection.html | 39 +++ docs/libnm-glib/html/NMWimaxNsp.html | 8 + docs/libnm-glib/html/api-index-full.html | 376 ++++++++++++++++++++++- docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 33 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 18 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 15 +- docs/libnm-glib/html/object-tree.html | 4 + 26 files changed, 1084 insertions(+), 46 deletions(-) (limited to 'docs/libnm-glib/html') diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 57efc51f..4b43358c 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties @@ -80,6 +82,12 @@ const +

Implemented Interfaces

+

+NMAccessPoint implements + GInitable and GAsyncInitable.

+ +

Properties

   "bssid"                    gchar*                : Read
@@ -211,7 +219,31 @@ const gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
                                                          NMConnection *connection);

+Validates a given connection against a given WiFi access point to ensure that +the connection may be activated with that AP. The connection must match the +ap's SSID, (if given) BSSID, and other attributes like security settings, +channel, band, etc.

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

ap :

an NMAccessPoint to validate connection against

connection :

an NMConnection to validate against ap +

Returns :

 +TRUE if the connection may be activated with this WiFi AP, +FALSE if it cannot be.
@@ -224,6 +256,12 @@ return connections which may be activated with the access point. Any returned connections will match the ap's SSID and (if given) BSSID and other attributes like security settings, channel, etc.

+

+To obtain the list of connections that are compatible with this access point, +use nm_remote_settings_list_connections() and then filter the returned list +for a given NMDevice using nm_device_filter_connections() and finally +filter that list with this function. +

diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index 15d628d7..17ebafd4 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties
@@ -47,6 +49,7 @@ #define NM_ACTIVE_CONNECTION_DEFAULT #define NM_ACTIVE_CONNECTION_DEFAULT6 #define NM_ACTIVE_CONNECTION_DEVICES +#define NM_ACTIVE_CONNECTION_MASTER #define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT #define NM_ACTIVE_CONNECTION_STATE #define NM_ACTIVE_CONNECTION_UUID @@ -54,6 +57,7 @@ const char * gboolean nm_active_connection_get_default (NMActiveConnection *connection); gboolean nm_active_connection_get_default6 (NMActiveConnection *connection); const GPtrArray * nm_active_connection_get_devices (NMActiveConnection *connection); +const char * nm_active_connection_get_master (NMActiveConnection *connection); const char * nm_active_connection_get_specific_object (NMActiveConnection *connection); NMActiveConnectionState nm_active_connection_get_state (NMActiveConnection *connection); @@ -72,14 +76,22 @@ const char * +

Implemented Interfaces

+

+NMActiveConnection implements + GInitable and GAsyncInitable.

+
+

Properties

   "connection"               gchar*                : Read
   "default"                  gboolean              : Read
   "default6"                 gboolean              : Read
   "devices"                  NMObjectArray*        : Read
+  "master"                   gchar*                : Read
   "specific-object"          gchar*                : Read
   "state"                    guint                 : Read
+  "uuid"                     gchar*                : Read
@@ -147,6 +159,14 @@ const char * +

NM_ACTIVE_CONNECTION_MASTER

+
#define NM_ACTIVE_CONNECTION_MASTER              "master"
+
+

+

+
+
+

NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
@@ -266,6 +286,29 @@ This is the internal copy used by the connection, and must not be modified.
+

nm_active_connection_get_master ()

+
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);
+

+Gets the path to the master NMDevice of the connection. +

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

connection :

a NMActiveConnection +

Returns :

the path of the master NMDevice of the NMActiveConnection. +This is the internal string used by the connection, and must not be modified.
+
+
+

nm_active_connection_get_specific_object ()

const char *        nm_active_connection_get_specific_object
                                                         (NMActiveConnection *connection);
@@ -398,6 +441,15 @@ Whether the active connection is the default IPv6 one.
+

The "master" property

+
  "master"                   gchar*                : Read
+

+The path of the master device if one exists. +

+

Default value: NULL

+
+
+

The "specific-object" property

  "specific-object"          gchar*                : Read

@@ -415,6 +467,15 @@ The state of the active connection.

Allowed values: <= 3

Default value: 0

+
+
+

The "uuid" property

+
  "uuid"                     gchar*                : Read
+

+The active connection's UUID +

+

Default value: NULL

+
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 81015347..7133c489 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties  |  Signals @@ -98,8 +100,13 @@ const char * void nm_client_networking_set_enabled (NMClient *client, gboolean enabled); NMClient * nm_client_new (void); +void nm_client_new_async (GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +NMClient * nm_client_new_finish (GAsyncResult *result, + GError **error); void nm_client_sleep (NMClient *client, - gboolean sleep); + gboolean sleep_); gboolean nm_client_wimax_get_enabled (NMClient *client); gboolean nm_client_wimax_hardware_get_enabled (NMClient *client); @@ -125,6 +132,12 @@ const char * +

Implemented Interfaces

+

+NMClient implements + GInitable and GAsyncInitable.

+
+

Properties

   "active-connections"       NMObjectArray*        : Read
@@ -734,6 +747,16 @@ all controlled interfaces are available for activation.
 

 Creates a new NMClient.
 

+

+Note that this will do blocking D-Bus calls to initialize the
+client. You can use nm_client_new_async() if you want to avoid
+that.
+

+

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
+

 

@@ -745,9 +768,73 @@ Creates a new 
 

 

+
nm_client_new_async ()

+
void                nm_client_new_async                 (GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

+

+Creates a new NMClient and begins asynchronously initializing it.
+callback will be called when it is done; use
+nm_client_new_finish() to get the result.
+

+

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
+

+

 
 

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


cancellable :
a GCancellable, or NULL
+
callback :
callback to call when the client is created
user_data :
data for callback
+

+
+
+
+

nm_client_new_finish ()

+
NMClient *          nm_client_new_finish                (GAsyncResult *result,
+                                                         GError **error);
+

+Gets the result of an nm_client_new_async() call. +

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

result :

a GAsyncResult +

error :

location for a GError, or NULL +

Returns :

a new NMClient, or NULL on error
+
+
+

nm_client_sleep ()

void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep);
+ gboolean sleep_);

Deprecated; use nm_client_networking_set_enabled() instead.

@@ -760,7 +847,7 @@ Deprecated; use sleep :

+

sleep_ :

TRUE to put the daemon to sleep diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html index 902e6f06..597e818d 100644 --- a/docs/libnm-glib/html/NMDHCP4Config.html +++ b/docs/libnm-glib/html/NMDHCP4Config.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties @@ -60,6 +62,12 @@ const char * +

Implemented Interfaces

+

+NMDHCP4Config implements + GInitable and GAsyncInitable.

+
+

Properties

   "options"                  GHashTable*           : Read
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 757e6cdf..a6be2c66 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -60,6 +62,12 @@ const char *        
+
Implemented Interfaces

+

+NMDHCP6Config implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "options"                  GHashTable*           : Read
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 0ffed799..e507f9e0 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -62,6 +64,7 @@
 #define             NM_DEVICE_MANAGED
 #define             NM_DEVICE_PRODUCT
 #define             NM_DEVICE_STATE
+#define             NM_DEVICE_STATE_REASON
 #define             NM_DEVICE_UDI
 #define             NM_DEVICE_VENDOR
 gboolean            nm_device_connection_valid          (NMDevice *device,
@@ -85,6 +88,8 @@ const char *        gboolean            nm_device_get_managed               (NMDevice *device);
 const char *        nm_device_get_product               (NMDevice *device);
 NMDeviceState       nm_device_get_state                 (NMDevice *device);
+NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
+                                                         NMDeviceStateReason *reason);
 const char *        nm_device_get_udi                   (NMDevice *device);
 const char *        nm_device_get_vendor                (NMDevice *device);
 GObject *           nm_device_new                       (DBusGConnection *connection,
@@ -102,14 +107,24 @@ const char *        NMDeviceModem
                +----NMDeviceBt
                +----NMDeviceWimax
+               +----NMDeviceOlpcMesh
+               +----NMDeviceInfiniband
+               +----NMDeviceBond
+               +----NMDeviceVlan
+

Implemented Interfaces

+

+NMDevice implements + GInitable and GAsyncInitable.

+
+

Properties

   "active-connection"        NMActiveConnection*   : Read
   "capabilities"             guint                 : Read
-  "device-type"              guint                 : Read / Write / Construct Only
+  "device-type"              guint                 : Read
   "dhcp4-config"             NMDHCP4Config*        : Read
   "dhcp6-config"             NMDHCP6Config*        : Read
   "driver"                   gchar*                : Read
@@ -121,6 +136,7 @@ const char *        managed"                  gboolean              : Read
   "product"                  gchar*                : Read
   "state"                    guint                 : Read
+  "state-reason"             GValueArray_guint+guint_*  : Read
   "udi"                      gchar*                : Read
   "vendor"                   gchar*                : Read
@@ -156,8 +172,9 @@ const char * char * +

NM_DEVICE_STATE_REASON

+
#define NM_DEVICE_STATE_REASON "state-reason"
+
+

+

+
+
+

NM_DEVICE_UDI

#define NM_DEVICE_UDI "udi"
@@ -388,7 +413,8 @@ is a WiFi device that supports only WEP encryption, the returned list will contain any WiFi connections in connections that allow connection to unencrypted or WEP-enabled SSIDs. The returned list will not contain Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is -incompatible with the device. +incompatible with the device. To get the full list of connections see +nm_remote_settings_list_connections().

@@ -741,6 +767,35 @@ Gets the current
+

nm_device_get_state_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). +

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

device :

a NMDevice +

reason :

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

Returns :

the current device state
+
+
+

nm_device_get_udi ()

const char *        nm_device_get_udi                   (NMDevice *device);

@@ -836,7 +891,7 @@ The capabilities of the device.

The "device-type" property

-
  "device-type"              guint                 : Read / Write / Construct Only
+
  "device-type"              guint                 : Read

The numeric type of the device.

@@ -941,6 +996,14 @@ The state of the device.
+

The "state-reason" property

+
  "state-reason"             GValueArray_guint+guint_*  : Read
+

+The state and reason of the device. +

+
+
+

The "udi" property

  "udi"                      gchar*                : Read

diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html index f69db886..b41291a5 100644 --- a/docs/libnm-glib/html/NMDeviceBt.html +++ b/docs/libnm-glib/html/NMDeviceBt.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties @@ -63,6 +65,12 @@ const char * +

Implemented Interfaces

+

+NMDeviceBt implements + GInitable and GAsyncInitable.

+
+

Properties

   "bt-capabilities"          guint                 : Read
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index cdadb509..786a5842 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const char *        
+
Implemented Interfaces

+

+NMDeviceEthernet implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "carrier"                  gboolean              : Read
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 0ab7408d..751da6e3 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -61,6 +63,12 @@
+

Implemented Interfaces

+

+NMDeviceModem implements + GInitable and GAsyncInitable.

+
+

Properties

   "current-capabilities"     guint                 : Read
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index fe9c3021..f08d0b79 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -78,6 +80,12 @@ const char *        
+
Implemented Interfaces

+

+NMDeviceWifi implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "active-access-point"      NMAccessPoint*        : Read
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 33bd2509..6daa921a 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -77,6 +79,12 @@ const 
+
Implemented Interfaces

+

+NMDeviceWimax implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "active-nsp"               NMWimaxNsp*           : Read
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index 67a8f4fd..b828b574 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const 
+
Implemented Interfaces

+

+NMIP4Config implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "addresses"                gpointer              : Read
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 36385aad..bc6c9d53 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -64,6 +66,12 @@ const 
+
Implemented Interfaces

+

+NMIP6Config implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "addresses"                NMIP6AddressObjectArray*  : Read
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index c336d432..24bb4276 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
 
 
@@ -66,6 +68,12 @@ const char *        
+
Implemented Interfaces

+

+NMObject implements
+ GInitable and  GAsyncInitable.

+
+

Properties

   "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index a674fe2f..531ab09d 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -80,10 +82,15 @@
+

Implemented Interfaces

+

+NMRemoteConnection implements + GInitable and GAsyncInitable.

+
+

Properties

   "bus"                      DBusGConnection*      : Write / Construct Only
-  "init-result"              guint                 : Read
@@ -307,14 +314,6 @@ Creates a new object representing the remote connection. 
  "bus"                      DBusGConnection*      : Write / Construct Only

DBusGConnection.

-
-
-

The "init-result" property

-
  "init-result"              guint                 : Read
-

Initialization result (PRIVATE).

-

Allowed values: <= 2

-

Default value: 0

-

Signal Details

diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index 558cec46..4ed57b08 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties  |  Signals @@ -57,6 +59,7 @@ enum NM_REMOTE_SETTINGS_BUS #define NM_REMOTE_SETTINGS_CAN_MODIFY #define NM_REMOTE_SETTINGS_CONNECTIONS_READ +#define NM_REMOTE_SETTINGS_ERROR #define NM_REMOTE_SETTINGS_HOSTNAME #define NM_REMOTE_SETTINGS_NEW_CONNECTION #define NM_REMOTE_SETTINGS_SERVICE_RUNNING @@ -73,6 +76,12 @@ enum const char *uuid); GSList * nm_remote_settings_list_connections (NMRemoteSettings *settings); NMRemoteSettings * nm_remote_settings_new (DBusGConnection *bus); +void nm_remote_settings_new_async (DBusGConnection *bus, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +NMRemoteSettings * nm_remote_settings_new_finish (GAsyncResult *result, + GError **error); gboolean nm_remote_settings_save_hostname (NMRemoteSettings *settings, const char *hostname, NMRemoteSettingsSaveHostnameFunc callback, @@ -87,6 +96,12 @@ enum +

Implemented Interfaces

+

+NMRemoteSettings implements + GInitable and GAsyncInitable.

+
+

Properties

   "bus"                      DBusGConnection*      : Read / Write / Construct Only
@@ -154,9 +169,9 @@ enum                
 
enum NMRemoteSettingsError

 
typedef enum {
-	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
+	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,     /*< nick=ConnectionRemoved >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/
 } NMRemoteSettingsError;
 

 

@@ -220,6 +235,14 @@ Describes errors that may result from operations involving a 
 

 

+
NM_REMOTE_SETTINGS_ERROR

+
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_HOSTNAME

 
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
 

@@ -390,6 +413,11 @@ using nm_remote_settings_new_async() if you
+want to avoid that.
+

 

@@ -407,6 +435,72 @@ Creates a new object representing the remote settings service.
 

+
nm_remote_settings_new_async ()

+
void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

+

+Creates a new object representing the remote settings service and
+begins asynchronously initializing it. callback will be called
+when it is done; use nm_remote_settings_new_finish() to get the
+result.
+

+

 
 
 
 

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


bus :
a valid and connected D-Bus connection. [allow-none]
+
cancellable :
a GCancellable, or NULL
+
callback :
callback to call when the settings object is created
user_data :
data for callback
+

+

+

+

+
nm_remote_settings_new_finish ()

+
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);

+

+Gets the result of an nm_remote_settings_new_async() call.
+

+

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


result :
a GAsyncResult
+
error :
location for a GError, or NULL
+
Returns :
a new NMRemoteSettings object, or NULL on error

+

+

+

 
nm_remote_settings_save_hostname ()

 
gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
                                                          const char *hostname,
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index c080405b..f7254c2a 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -61,6 +61,7 @@ enum                GError *error,
                                                          gpointer user_data);
 #define             NM_SECRET_AGENT_AUTO_REGISTER
+#define             NM_SECRET_AGENT_ERROR
 #define             NM_SECRET_AGENT_IDENTIFIER
 #define             NM_SECRET_AGENT_REGISTRATION_RESULT
 void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
@@ -95,6 +96,7 @@ enum                
   "auto-register"            gboolean              : Read / Write / Construct
   "identifier"               gchar*                : Read / Write / Construct Only
+  "registered"               gboolean              : Read
 

 

 

@@ -197,18 +199,42 @@ enum                GError *error,
                                                          gpointer user_data);

+Called as a result of a request by NM to delete secrets. When the +NMSecretAgent subclass has finished deleting the secrets, this function +should be called.

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

agent :

the secret agent object

connection :

the connection for which secrets were to be deleted

error :

if the deleting secrets failed, give a descriptive error here

user_data :

caller-specific data to be passed to the function

enum NMSecretAgentError

typedef enum {
-	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0,
-	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
-	NM_SECRET_AGENT_ERROR_USER_CANCELED,
-	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
-	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
-	NM_SECRET_AGENT_ERROR_NO_SECRETS,
+	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, /*< nick=NotAuthorized >*/
+	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/
+	NM_SECRET_AGENT_ERROR_USER_CANCELED,      /*< nick=UserCanceled >*/
+	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,     /*< nick=AgentCanceled >*/
+	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,     /*< nick=InternalError >*/
+	NM_SECRET_AGENT_ERROR_NO_SECRETS,         /*< nick=NoSecrets >*/
 } NMSecretAgentError;

@@ -263,7 +289,93 @@ is allowed. GError *error, gpointer user_data);

+Called as a result of a request by NM to retrieve secrets. When the +NMSecretAgent subclass has finished retrieving secrets and is ready to +return them, or to return an error, this function should be called with +those secrets or the error. +

+

+To easily create the hash table to return the WiFi PSK, you could do +something like this:

+
+

Example 1. Creating a secrets hash

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
NMConnection *secrets;
+NMSettingWirelessSecurity *s_wsec;
+GHashTable *secrets_hash;
+
+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",
+              NULL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets);
+
+(call the NMSecretAgentGetSecretsFunc with secrets_hash)
+
+g_object_unref (secrets);
+g_hash_table_unref (secrets_hash);
+
+ +
+


+

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

agent :

the secret agent object

connection :

the connection for which secrets were requested

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") +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] +

error :

if the secrets request failed, give a descriptive error here

user_data :

caller-specific data to be passed to the function
@@ -273,7 +385,31 @@ is allowed. GError *error, gpointer user_data);

+Called as a result of a request by NM to save secrets. When the +NMSecretAgent subclass has finished saving the secrets, this function +should be called.

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

agent :

the secret agent object

connection :

the connection for which secrets were to be saved

error :

if the saving secrets failed, give a descriptive error here

user_data :

caller-specific data to be passed to the function
@@ -285,6 +421,14 @@ is allowed.
+

NM_SECRET_AGENT_ERROR

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+
+

+

+
+
+

NM_SECRET_AGENT_IDENTIFIER

#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
@@ -328,7 +472,7 @@ VFunc: delete_secrets

callback :

-a callback, invoked when the operation is done. [scope async] +a callback, to be invoked when the operation is done. [scope async] @@ -393,7 +537,7 @@ VFunc: get_secrets

callback :

-a callback, invoked when the operation is done. [scope async] +a callback, to be invoked when the operation is done. [scope async] @@ -461,7 +605,7 @@ VFunc: save_secrets

callback :

-a callback, invoked when the operation is done. [scope async] +a callback, to be invoked when the operation is done. [scope async] @@ -528,6 +672,15 @@ of 3 characters. An example valid identifier is 'org.gnome.nm-applet'

Default value: NULL

+
+
+

The "registered" property

+
  "registered"               gboolean              : Read
+

+TRUE if the agent is registered with NetworkManager, FALSE if not. +

+

Default value: FALSE

+

Signal Details

diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html index 852ec461..cd6d107e 100644 --- a/docs/libnm-glib/html/NMVPNConnection.html +++ b/docs/libnm-glib/html/NMVPNConnection.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties  |  Signals @@ -63,6 +65,12 @@ const char * +

Implemented Interfaces

+

+NMVPNConnection implements + GInitable and GAsyncInitable.

+
+

Properties

   "banner"                   gchar*                : Read
@@ -132,14 +140,45 @@ const char *        
nm_vpn_connection_get_banner ()

 
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

 

+Gets the VPN login banner of the active NMVPNConnection.
 

+

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


vpn :
a NMVPNConnection
+
Returns :
the VPN login banner of the VPN connection. This is the internal
+string used by the connection, and must not be modified.

nm_vpn_connection_get_vpn_state ()

NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);

+Gets the current NMVPNConnection state.

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

vpn :

a NMVPNConnection +

Returns :

the VPN state of the active VPN connection.
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index aa69342a..68a80693 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -27,6 +27,8 @@  |  Object Hierarchy  |  + Implemented Interfaces +  |  Properties @@ -67,6 +69,12 @@ const char * +

Implemented Interfaces

+

+NMWimaxNsp implements + GInitable and GAsyncInitable.

+
+

Properties

   "name"                     gchar*                : Read
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 28ab9214..e07f804b 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -207,6 +207,10 @@
 
 

 

+NMActiveConnection:master, object property in NMActiveConnection
+

+

+

 NMActiveConnection:specific-object, object property in NMActiveConnection
 

 

@@ -215,6 +219,10 @@
 
 

 

+NMActiveConnection:uuid, object property in NMActiveConnection
+

+

+

 NMActiveConnectionClass, struct in NMActiveConnection
 

 

@@ -251,6 +259,10 @@
 
 

 

+nm_active_connection_get_master, function in NMActiveConnection
+

+

+

 nm_active_connection_get_specific_object, function in NMActiveConnection
 

 

@@ -263,6 +275,10 @@
 
 

 

+NM_ACTIVE_CONNECTION_MASTER, macro in NMActiveConnection
+

+

+

 nm_active_connection_new, function in NMActiveConnection
 

 

@@ -428,6 +444,14 @@
 
 

 

+nm_client_new_async, function in NMClient
+

+

+

+nm_client_new_finish, function in NMClient
+

+

+

 nm_client_sleep, function in NMClient
 

 

@@ -501,6 +525,50 @@
 

 
D

 

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection, macro in nm-exported-connection-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection_Secrets, macro in nm-exported-connection-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_System, macro in nm-settings-system-bindings
+

+

+

+DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Infiniband, macro in nm-device-infiniband-bindings
+

+

+

+dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER, function in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__BOXED_POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_NONE__STRING_BOXED_BOOLEAN_POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER, function in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__POINTER, macro in nm-exported-connection-glue
+

+

+

+dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER, function in nm-exported-connection-glue
+

+

+

 dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER, macro in nm-secret-agent-glue
 

 

@@ -525,10 +593,18 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
 
 

 

+dbus_glib_nm_exported_connection_object_info, variable in nm-exported-connection-glue
+

+

+

 dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 

 

 

+dbus_g_proxy_begin_call, function in nm-settings-system-bindings
+

+

+

 NMDevice, struct in NMDevice
 

 

@@ -593,6 +669,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDevice:state-reason, object property in NMDevice
+

+

+

 NMDevice:udi, object property in NMDevice
 

 

@@ -601,6 +681,22 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceBond, struct in NMDeviceBond
+

+

+

+NMDeviceBond:carrier, object property in NMDeviceBond
+

+

+

+NMDeviceBond:hw-address, object property in NMDeviceBond
+

+

+

+NMDeviceBondClass, struct in NMDeviceBond
+

+

+

 NMDeviceBt, struct in NMDeviceBt
 

 

@@ -653,6 +749,22 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceInfiniband, struct in NMDeviceInfiniband
+

+

+

+NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband
+

+

+

+NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband
+

+

+

+NMDeviceInfinibandClass, struct in NMDeviceInfiniband
+

+

+

 NMDeviceModem, struct in NMDeviceModem
 

 

@@ -669,6 +781,46 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NMDeviceOlpcMesh, struct in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh
+

+

+

+NMDeviceOlpcMeshClass, struct in NMDeviceOlpcMesh
+

+

+

+NMDeviceVlan, struct in NMDeviceVlan
+

+

+

+NMDeviceVlan:carrier, object property in NMDeviceVlan
+

+

+

+NMDeviceVlan:hw-address, object property in NMDeviceVlan
+

+

+

+NMDeviceVlan:vlan-id, object property in NMDeviceVlan
+

+

+

+NMDeviceVlanClass, struct in NMDeviceVlan
+

+

+

 NMDeviceWifi, struct in NMDeviceWifi
 

 

@@ -757,6 +909,26 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
+

+

+

+nm_device_bond_get_carrier, function in NMDeviceBond
+

+

+

+nm_device_bond_get_hw_address, function in NMDeviceBond
+

+

+

+NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
+

+

+

+nm_device_bond_new, function in NMDeviceBond
+

+

+

 NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
 

 

@@ -913,6 +1085,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+nm_device_get_state_reason, function in NMDevice
+

+

+

 nm_device_get_udi, function in NMDevice
 

 

@@ -921,6 +1097,26 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
+

+

+

+NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_new, function in NMDeviceInfiniband
+

+

+

 NM_DEVICE_INTERFACE, macro in NMDevice
 

 

@@ -961,6 +1157,34 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
+

+

+

+nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
+

+

+

 NM_DEVICE_PRODUCT, macro in NMDevice
 

 

@@ -969,6 +1193,10 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_STATE_REASON, macro in NMDevice
+

+

+

 NM_DEVICE_UDI, macro in NMDevice
 

 

@@ -977,6 +1205,34 @@ dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
 
 

 

+NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
+

+

+

+nm_device_vlan_get_carrier, function in NMDeviceVlan
+

+

+

+nm_device_vlan_get_hw_address, function in NMDeviceVlan
+

+

+

+nm_device_vlan_get_vlan_id, function in NMDeviceVlan
+

+

+

+NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
+

+

+

+nm_device_vlan_new, function in NMDeviceVlan
+

+

+

+NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
+

+

+

 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, macro in NMDeviceWifi
 

 

@@ -1403,6 +1659,102 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 nm_object_get_path, function in NMObject
 
 

+

+org_freedesktop_NetworkManagerSettings_Connection_delete, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_delete_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_get_settings_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_async, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_async_callback, function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_Connection_update_reply, user_function in nm-exported-connection-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_async, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_async_callback, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_get_permissions_reply, user_function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_async, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_async_callback, function in nm-settings-system-bindings
+

+

+

+org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function in nm-settings-system-bindings
+

+

 
R

 

 NMRemoteConnection, struct in NMRemoteConnection
@@ -1425,10 +1777,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 

 

 

-NMRemoteConnection:init-result, object property in NMRemoteConnection
-

-

-

 NMRemoteConnectionClass, struct in NMRemoteConnection
 

 

@@ -1529,6 +1877,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NM_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings
+

+

+

 nm_remote_settings_error_quark, function in NMRemoteSettings
 

 

@@ -1553,10 +1905,18 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+nm_remote_settings_new_async, function in NMRemoteSettings
+

+

+

 NM_REMOTE_SETTINGS_NEW_CONNECTION, macro in NMRemoteSettings
 

 

 

+nm_remote_settings_new_finish, function in NMRemoteSettings
+

+

+

 nm_remote_settings_save_hostname, function in NMRemoteSettings
 

 

@@ -1582,6 +1942,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NMSecretAgent:registered, object property in NMSecretAgent
+

+

+

 NMSecretAgentClass, struct in NMSecretAgent
 

 

@@ -1614,6 +1978,10 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 
 

 

+NM_SECRET_AGENT_ERROR, macro in NMSecretAgent
+

+

+

 nm_secret_agent_error_quark, function in NMSecretAgent
 

 

diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index ed4607b2..72bb7148 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 70270f38..e81d55c8 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -29,7 +29,7 @@

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 3df60aeb..5f5404f7 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -2,6 +2,7 @@ + @@ -37,6 +38,8 @@ + + @@ -66,6 +69,7 @@ + @@ -75,6 +79,7 @@ + @@ -82,6 +87,7 @@ + @@ -91,11 +97,14 @@ + + + @@ -117,6 +126,7 @@ + @@ -136,6 +146,7 @@ + @@ -154,6 +165,7 @@ + @@ -161,6 +173,7 @@ + @@ -183,6 +196,7 @@ + @@ -217,6 +231,7 @@ + @@ -232,6 +247,7 @@ + @@ -251,6 +267,7 @@ + @@ -288,6 +305,7 @@ + @@ -310,6 +328,7 @@ + @@ -352,6 +371,7 @@ + @@ -377,6 +397,7 @@ + @@ -399,6 +420,7 @@ + @@ -413,6 +435,7 @@ + @@ -427,6 +450,7 @@ + @@ -442,6 +466,7 @@ + @@ -459,7 +484,6 @@ - @@ -467,6 +491,7 @@ + @@ -482,6 +507,7 @@ + @@ -491,6 +517,8 @@ + + @@ -522,6 +550,7 @@ + @@ -533,11 +562,13 @@ + + diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html index d6ecdc55..a8f13163 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html +++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html @@ -123,15 +123,15 @@ enum

enum NMVPNPluginError

typedef enum {
-	NM_VPN_PLUGIN_ERROR_GENERAL,
-	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,
-	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,
-	NM_VPN_PLUGIN_ERROR_WRONG_STATE,
-	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
-	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
+	NM_VPN_PLUGIN_ERROR_GENERAL,              /*< nick=General >*/
+	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, /*< nick=StartingInProgress >*/
+	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,      /*< nick=AlreadyStarted >*/
+	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, /*< nick=StoppingInProgress >*/
+	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,      /*< nick=AlreadyStopped >*/
+	NM_VPN_PLUGIN_ERROR_WRONG_STATE,          /*< nick=WrongState >*/
+	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,        /*< nick=BadArguments >*/
+	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,        /*< nick=LaunchFailed >*/
+	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,   /*< nick=ConnectionInvalid >*/
 } NMVPNPluginError;

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 74226d52..edbb4a26 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -64,6 +64,8 @@ + + @@ -94,6 +96,7 @@ + @@ -101,6 +104,7 @@ + @@ -109,8 +113,10 @@ + + @@ -128,6 +134,7 @@ + @@ -147,6 +154,7 @@ + @@ -164,6 +172,7 @@ + @@ -372,7 +381,6 @@ - @@ -384,6 +392,7 @@ + @@ -393,6 +402,8 @@ + + @@ -408,6 +419,7 @@ + @@ -418,6 +430,7 @@ + diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index 1da8b8e0..bbc78129 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -32,6 +32,10 @@ NMDeviceModem NMDeviceBt NMDeviceWimax + NMDeviceOlpcMesh + NMDeviceInfiniband + NMDeviceBond + NMDeviceVlan NMWimaxNsp NMAccessPoint NMIP4Config -- cgit 1.3.0-6-gf8a5