From 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Apr 2011 10:42:53 +0200 Subject: Imported Upstream version 0.8.4.0 --- docs/libnm-util/html/NMConnection.html | 1062 +++++++++++++ docs/libnm-util/html/NMSetting.html | 381 ++--- docs/libnm-util/html/NMSetting8021x.html | 1602 +++++++++++++------- docs/libnm-util/html/NMSettingBluetooth.html | 114 +- docs/libnm-util/html/NMSettingCdma.html | 132 +- docs/libnm-util/html/NMSettingConnection.html | 336 +--- docs/libnm-util/html/NMSettingGsm.html | 417 +++-- docs/libnm-util/html/NMSettingIP4Config.html | 1142 +++++++++++--- docs/libnm-util/html/NMSettingIP6Config.html | 1097 +++++++++++--- docs/libnm-util/html/NMSettingOlpcMesh.html | 126 +- docs/libnm-util/html/NMSettingPPP.html | 446 +++++- docs/libnm-util/html/NMSettingPPPOE.html | 154 +- docs/libnm-util/html/NMSettingSerial.html | 173 ++- docs/libnm-util/html/NMSettingVPN.html | 294 +++- docs/libnm-util/html/NMSettingWired.html | 322 +++- docs/libnm-util/html/NMSettingWireless.html | 444 ++++-- .../libnm-util/html/NMSettingWirelessSecurity.html | 613 +++++--- docs/libnm-util/html/annotation-glossary.html | 43 +- docs/libnm-util/html/api-index-full.html | 490 +++--- docs/libnm-util/html/ch01.html | 16 +- docs/libnm-util/html/index.html | 13 +- docs/libnm-util/html/index.sgml | 184 +-- docs/libnm-util/html/libnm-util-nm-utils.html | 535 +++++-- docs/libnm-util/html/libnm-util.devhelp | 129 +- docs/libnm-util/html/libnm-util.devhelp2 | 148 +- docs/libnm-util/html/object-tree.html | 33 +- docs/libnm-util/html/style.css | 3 +- 27 files changed, 7412 insertions(+), 3037 deletions(-) create mode 100644 docs/libnm-util/html/NMConnection.html (limited to 'docs/libnm-util/html') diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html new file mode 100644 index 00000000..3ff24b7e --- /dev/null +++ b/docs/libnm-util/html/NMConnection.html @@ -0,0 +1,1062 @@ + + + + +NMConnection + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMConnection

+

NMConnection — Describes a connection to specific network or provider

+
+
+

Synopsis

+
+#include <nm-connection.h>
+
+enum                NMConnectionScope;
+enum                NMConnectionError;
+#define             NM_TYPE_CONNECTION_ERROR
+#define             NM_CONNECTION_ERROR
+GQuark              nm_connection_error_quark           (void);
+#define             NM_CONNECTION_SCOPE
+#define             NM_CONNECTION_PATH
+                    NMConnection;
+                    NMConnectionClass;
+GType               nm_connection_get_type              (void);
+NMConnection *      nm_connection_new                   (void);
+NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);
+void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);
+gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);
+gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);
+gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);
+gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);
+const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);
+void                nm_connection_clear_secrets         (NMConnection *connection);
+gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *setting_secrets,
+                                                         GError **error);
+void                nm_connection_set_scope             (NMConnection *connection,
+                                                         NMConnectionScope scope);
+NMConnectionScope   nm_connection_get_scope             (NMConnection *connection);
+void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+const char *        nm_connection_get_path              (NMConnection *connection);
+void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);
+GHashTable *        nm_connection_to_hash               (NMConnection *connection);
+void                nm_connection_dump                  (NMConnection *connection);
+NMSetting *         nm_connection_create_setting        (const char *name);
+GType               nm_connection_lookup_setting_type   (const char *name);
+GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----NMConnection
+
+
+
+

Properties

+
+  "path"                     gchar*                : Read / Write / Construct
+  "scope"                    guint                 : Read / Write / Construct
+
+
+
+

Signals

+
+  "secrets-updated"                                : Run First
+
+
+
+

Description

+

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

+

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

+

+Most connections also have a NMConnectionScope; a connection will be +provided over D-Bus either by the user settings service +(org.freedesktop.NetworkManagerUserSettings) running in an active user +session, or by the system-wide system settings service +(org.freedesktop.NetworkManagerSystemSettings) which provides connections +for all users. +

+
+
+

Details

+
+

enum NMConnectionScope

+
typedef enum {
+	NM_CONNECTION_SCOPE_UNKNOWN = 0,
+	NM_CONNECTION_SCOPE_SYSTEM,
+	NM_CONNECTION_SCOPE_USER
+} NMConnectionScope;
+
+

+Connection scope indicated what settings service, if any, provides the +connection. +

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

NM_CONNECTION_SCOPE_UNKNOWN

scope not known or not yet set +

NM_CONNECTION_SCOPE_SYSTEM

connection is provided by the system settings + service +

NM_CONNECTION_SCOPE_USER

connection is provided by a user settings service +
+
+
+
+

enum NMConnectionError

+
typedef enum
+{
+	NM_CONNECTION_ERROR_UNKNOWN = 0,
+	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
+} NMConnectionError;
+
+

+Describes errors that may result from operations involving a NMConnection. +

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

NM_CONNECTION_ERROR_UNKNOWN

unknown or unclassified error +

NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND

the NMConnection object + did not contain the required NMSettingConnection object, which must be + present for all connections +
+
+
+
+

NM_TYPE_CONNECTION_ERROR

+
#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
+
+

+

+
+
+
+

NM_CONNECTION_ERROR

+
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+
+

+

+
+
+
+

nm_connection_error_quark ()

+
GQuark              nm_connection_error_quark           (void);
+

+Registers an error quark for NMConnection if necessary. +

+
++ + + + +

Returns :

 the error quark used for NMConnection errors. +
+
+
+
+

NM_CONNECTION_SCOPE

+
#define NM_CONNECTION_SCOPE "scope"
+
+

+

+
+
+
+

NM_CONNECTION_PATH

+
#define NM_CONNECTION_PATH "path"
+
+

+

+
+
+
+

NMConnection

+
typedef struct _NMConnection NMConnection;
+

+The NMConnection struct contains only private data. +It should only be accessed through the functions described below. +

+
+
+
+

NMConnectionClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection, const char * setting);
+} NMConnectionClass;
+
+

+

+
+
+
+

nm_connection_get_type ()

+
GType               nm_connection_get_type              (void);
+

+

+
++ + + + +

Returns :

 +
+
+
+
+

nm_connection_new ()

+
NMConnection *      nm_connection_new                   (void);
+

+Creates a new NMConnection object with no NMSetting objects. +

+
++ + + + +

Returns :

 the new empty NMConnection object +
+
+
+
+

nm_connection_new_from_hash ()

+
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+

+Creates a new NMConnection from a hash table describing the connection. See +nm_connection_to_hash() for a description of the expected hash table. +

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

hash :

the GHashTable describing the connection +

error :

on unsuccessful return, an error +

Returns :

 the new NMConnection object, populated with settings created +from the values in the hash table, or NULL if the connection failed to +validate +
+
+
+
+

nm_connection_duplicate ()

+
NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+

+Duplicates a NMConnection. +

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

connection :

the NMConnection to duplicate +

Returns :

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

nm_connection_add_setting ()

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

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

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

connection :

a NMConnection +

setting :

the NMSetting to add to the connection object +
+
+
+
+

nm_connection_remove_setting ()

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

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

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

connection :

a NMConnection +

setting_type :

the GType of the setting object to remove +
+
+
+
+

nm_connection_get_setting ()

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

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

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

connection :

a NMConnection +

setting_type :

the GType of the setting object to return +

Returns :

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

nm_connection_get_setting_by_name ()

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

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

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

connection :

a NMConnection +

name :

a setting name +

Returns :

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

nm_connection_replace_settings ()

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

connection :

a NMConnection +

new_settings :

a GHashTable of settings +

error :

location to store error, or NULL +

Returns :

 TRUE if the settings were valid and added to the connection, FALSE +if they were not +
+
+
+
+

nm_connection_compare ()

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

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

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

a :

a NMConnection +

b :

a second NMConnection to compare with the first +

flags :

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT +

Returns :

 TRUE if the comparison succeeds, FALSE if it does not +
+
+
+
+

nm_connection_diff ()

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

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

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

a :

a NMConnection +

b :

a second NMConnection to compare with the first +

flags :

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT +

out_settings :

if the connections differ, on return a hash table mapping +setting names to second-level GHashTable, which contains key names that differ +

Returns :

 TRUE if the connections contain the same values, FALSE if they do +not +
+
+
+
+

nm_connection_verify ()

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

+Validates the connection and all its settings. Each setting's properties +have allowed values, and some values are dependent on other values. For +example, if a WiFi connection is security enabled, the NMSettingWireless +setting object's 'security' property must contain the setting name of the +NMSettingWirelessSecurity object, which must also be present in the +connection for the connection to be valid. As another example, the +NMSettingWired object's 'mac-address' property must be a validly formatted +MAC address. The returned GError contains information about which +setting and which property failed validation, and how it failed validation. +

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

connection :

the NMConnection to verify +

error :

location to store error, or NULL +

Returns :

 TRUE if the connection is valid, FALSE if it is not +
+
+
+
+

nm_connection_need_secrets ()

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

+Returns the name of the first setting object in the connection which would +need secrets to make a successful connection. The returned hints are only +intended as a guide to what secrets may be required, because in some +circumstances, there is no way to conclusively determine exactly which +secrets are needed. +

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

connection :

the NMConnection +

hints :

the address of a pointer to a GPtrArray, initialized to NULL, which +on return points to an allocated GPtrArray containing the property names of +secrets of the NMSetting which may be required; the caller owns the array +and must free the each array element with g_free(), as well as the array +itself with g_ptr_array_free() +

Returns :

 the setting name of the NMSetting object which has invalid or +missing secrets +
+
+
+
+

nm_connection_clear_secrets ()

+
void                nm_connection_clear_secrets         (NMConnection *connection);
+

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

+
++ + + + +

connection :

the NMConnection +
+
+
+
+

nm_connection_update_secrets ()

+
gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *setting_secrets,
+                                                         GError **error);
+

+Update the specified setting's secrets, given a hash table of secrets +intended for that setting (deserialized from D-Bus for example). +

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

connection :

the NMConnection +

setting_name :

the setting object name to which the secrets apply +

setting_secrets :

a GHashTable mapping string:GValue of setting property names and +secrets +

error :

location to store error, or NULL +

Returns :

 TRUE if the secrets were successfully updated and the connection +is valid, FALSE on failure or if the setting was never added to the connection +
+
+
+
+

nm_connection_set_scope ()

+
void                nm_connection_set_scope             (NMConnection *connection,
+                                                         NMConnectionScope scope);
+

+Sets the scope of the connection. This property is not serialized, and is +only for the reference of the caller. A connection may have no scope +(internal, temporary connections), "system" scope (provided by the system +settings service), or "user" scope, provided by a user settings service. The +creator of the NMConnection object is responsible for setting the +connection's scope if needed. Sets the "scope" property. +

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

connection :

the NMConnection +

scope :

the scope of the connection +
+
+
+
+

nm_connection_get_scope ()

+
NMConnectionScope   nm_connection_get_scope             (NMConnection *connection);
+

+Returns the connection scope. +

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

connection :

the NMConnection +

Returns :

 the scope of the connection, previously set by a call to +nm_connection_set_scope(). +
+
+
+
+

nm_connection_set_path ()

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

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

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

connection :

the NMConnection +

path :

the D-Bus path of the connection as given by the settings service +which provides the connection +
+
+
+
+

nm_connection_get_path ()

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

+Returns the connection's D-Bus path. +

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

connection :

the NMConnection +

Returns :

 the D-Bus path of the connection, previously set by a call to +nm_connection_set_path(). +
+
+
+
+

nm_connection_for_each_setting_value ()

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

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

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

connection :

the NMConnection +

func :

user-supplied function called for each setting's property +

user_data :

user data passed to func at each invocation +
+
+
+
+

nm_connection_to_hash ()

+
GHashTable *        nm_connection_to_hash               (NMConnection *connection);
+

+Converts the NMConnection into a GHashTable describing the connection, +suitable for marshalling over D-Bus or serializing. The hash table mapping +is string:GHashTable with each element in the returned hash representing +a NMSetting object. The keys are setting object names, and the values +are GHashTables mapping string:GValue, each of which represents the +properties of the NMSetting object. +

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

connection :

the NMConnection +

Returns :

 a new GHashTable describing the connection, its settings, and +each setting's properties. The caller owns the hash table and must unref +the hash table with g_hash_table_unref() when it is no longer needed. +
+
+
+
+

nm_connection_dump ()

+
void                nm_connection_dump                  (NMConnection *connection);
+

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

+
++ + + + +

connection :

the NMConnection +
+
+
+
+

nm_connection_create_setting ()

+
NMSetting *         nm_connection_create_setting        (const char *name);
+

+Create a new NMSetting object of the desired type, given a setting name. +

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

name :

a setting name +

Returns :

 the new setting object, or NULL if the setting name was unknown +
+
+
+
+

nm_connection_lookup_setting_type ()

+
GType               nm_connection_lookup_setting_type   (const char *name);
+

+Returns the GType of the setting's class for a given setting name. +

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

name :

a setting name +

Returns :

 the GType of the setting's class +
+
+
+
+

nm_connection_lookup_setting_type_by_quark ()

+
GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+

+Returns the GType of the setting's class for a given setting error quark. +Useful for figuring out which setting a returned error is for. +

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

error_quark :

a setting error quark +

Returns :

 the GType of the setting's class +
+
+
+
+

Property Details

+
+

The "path" property

+
  "path"                     gchar*                : Read / Write / Construct
+

+The connection's D-Bus path, used only by the calling process as a record +of the D-Bus path of the connection as provided by a settings service. +

+

Default value: NULL

+
+
+
+

The "scope" property

+
  "scope"                    guint                 : Read / Write / Construct
+

+The connection's scope, used only by the calling process as a record +of which settings service the connection is provided by. One of the +NM_CONNECTION_SCOPE_* defines. +

+

Allowed values: <= 2

+

Default value: 0

+
+
+
+

Signal Details

+
+

The "secrets-updated" signal

+
void                user_function                      (NMConnection *connection,
+                                                        gchar        *setting_name,
+                                                        gpointer      user_data)         : Run First
+

+The ::secrets-updated signal is emitted when the secrets of a setting +have been changed. +

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

connection :

the object on which the signal is emitted +

setting_name :

the setting name of the NMSetting for which secrets were +updated +

user_data :

user data set when the signal handler was connected.
+
+
+
+
+
+ Generated by GTK-Doc V1.15
+ + \ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index c77c5985..77129d21 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -6,15 +6,15 @@ - + - + - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,12 +39,12 @@
-
+

Synopsis

-
+
 #include <nm-setting.h>
 
-enum                NMSettingError;
+enum                NMSettingError;
 #define             NM_TYPE_SETTING_ERROR
 #define             NM_SETTING_ERROR
 GQuark              nm_setting_error_quark              (void);
@@ -53,7 +53,6 @@ enum                NMSetti
 #define             NM_SETTING_PARAM_SECRET
 #define             NM_SETTING_PARAM_FUZZY_IGNORE
 #define             NM_SETTING_NAME
-enum                NMSettingSecretFlags;
                     NMSetting;
                     NMSettingClass;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
@@ -62,9 +61,7 @@ enum                GParamFlags flags,
                                                          gpointer user_data);
 GType               nm_setting_get_type                 (void);
-enum                NMSettingHashFlags;
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
+GHashTable *        nm_setting_to_hash                  (NMSetting *setting);
 NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);
 NMSetting *         nm_setting_duplicate                (NMSetting *setting);
@@ -91,22 +88,10 @@ enum                gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
                                                          GError **error);
-gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);
-gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags flags,
-                                                         GError **error);
-
+

Object Hierarchy

-
-  GEnum
-   +----NMSettingError
-
   GObject
    +----NMSetting
@@ -122,32 +107,31 @@ enum                NMSettingPPPOE
          +----NMSettingSerial
          +----NMSettingVPN
-         +----NMSettingWimax
          +----NMSettingWired
          +----NMSettingWireless
          +----NMSettingWirelessSecurity
-
+

Properties

   "name"                     gchar*                : Read / Write
-
+

Description

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

-
+

Details

-
+

enum NMSettingError

typedef enum
 {
@@ -191,7 +175,7 @@ Describes errors that may result from operations involving a
-
+

NM_TYPE_SETTING_ERROR

#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ())
@@ -199,7 +183,7 @@ Describes errors that may result from operations involving a
-
+

NM_SETTING_ERROR

#define NM_SETTING_ERROR nm_setting_error_quark ()
@@ -207,7 +191,7 @@ Describes errors that may result from operations involving a
-
+

nm_setting_error_quark ()

GQuark              nm_setting_error_quark              (void);

@@ -217,12 +201,13 @@ Registers an error quark for

Returns :

-the error quark used for NMSetting errors. + the error quark used for NMSetting errors. +
-
+

NM_SETTING_PARAM_SERIALIZE

#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
@@ -230,7 +215,7 @@ Registers an error quark for +

NM_SETTING_PARAM_REQUIRED

#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
@@ -238,7 +223,7 @@ Registers an error quark for +

NM_SETTING_PARAM_SECRET

#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
@@ -246,7 +231,7 @@ Registers an error quark for +

NM_SETTING_PARAM_FUZZY_IGNORE

#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
@@ -254,7 +239,7 @@ Registers an error quark for +

NM_SETTING_NAME

#define NM_SETTING_NAME "name"
@@ -262,57 +247,7 @@ Registers an error quark for -

enum NMSettingSecretFlags

-
typedef enum {
-	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
-	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
-	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
-	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
-
-	/* NOTE: if adding flags, update nm-setting-private.h as well */
-} NMSettingSecretFlags;
-
-

-These flags indicate specific behavior related to handling of a secret. Each -secret has a corresponding set of these flags which indicate how the secret -is to be stored and/or requested when it is needed. -

-
-- - - - - - - - - - - - - - - - - - -

NM_SETTING_SECRET_FLAG_NONE

the system is responsible for providing and -storing this secret (default) -

NM_SETTING_SECRET_FLAG_AGENT_OWNED

a user secret agent is responsible -for providing and storing this secret; when it is required agents will be -asked to retrieve it -

NM_SETTING_SECRET_FLAG_NOT_SAVED

this secret should not be saved, but -should be requested from the user each time it is needed -

NM_SETTING_SECRET_FLAG_NOT_REQUIRED

in situations where it cannot be -automatically determined that the secret is required (some VPNs and PPP -providers dont require all secrets) this flag indicates that the specific -secret is not required -
-
-
-
+

NMSetting

typedef struct _NMSetting NMSetting;

@@ -321,7 +256,7 @@ It should only be accessed through the functions described below.

-
+

NMSettingClass

typedef struct {
 	GObjectClass parent;
@@ -338,18 +273,6 @@ It should only be accessed through the functions described below.
 	                                  GValue     *value,
 	                                  GError    **error);
 
-	gboolean    (*get_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags *out_flags,
-	                                  GError **error);
-
-	gboolean    (*set_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags flags,
-	                                  GError **error);
-
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -361,7 +284,7 @@ It should only be accessed through the functions described below.
-
+

NMSettingValueIterFn ()

void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
@@ -370,53 +293,56 @@ It should only be accessed through the functions described below.
                                                          gpointer user_data);

-
-
-
-

nm_setting_get_type ()

-
GType               nm_setting_get_type                 (void);
-

-

-
-
-
-

enum NMSettingHashFlags

-
typedef enum {
-	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
-	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
-	NM_SETTING_HASH_FLAG_ONLY_SECRETS = 0x00000002,
-} NMSettingHashFlags;
-
-

-These flags determine which properties are added to the resulting hash -when calling nm_setting_to_hash(). -

- - + - - + - - + + + + + + + + +

NM_SETTING_HASH_FLAG_ALL

hash all properties (including secrets) +

setting :

NM_SETTING_HASH_FLAG_NO_SECRETS

do not include secrets +

key :

NM_SETTING_HASH_FLAG_ONLY_SECRETS

only hash secrets +

value :

 +

flags :

 +

user_data :
-
+
+

nm_setting_get_type ()

+
GType               nm_setting_get_type                 (void);
+

+

+
++ + + + +

Returns :

 +
+
+
+

nm_setting_to_hash ()

-
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
+
GHashTable *        nm_setting_to_hash                  (NMSetting *setting);

Converts the NMSetting into a GHashTable mapping each setting property name to a GValue describing that property, suitable for marshalling over @@ -431,20 +357,15 @@ D-Bus or serializing. The mapping is string:GValue. -

flags :

-hash flags, e.g. NM_SETTING_HASH_FLAG_ALL - - -

Returns :

-a new GHashTable describing the setting's properties. [transfer full][element-type utf8 GObject.Value] + a new GHashTable describing the setting's properties
-
+

nm_setting_new_from_hash ()

NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);
@@ -461,23 +382,26 @@ property names and value types.

setting_type :

-the NMSetting type which the hash contains properties for +the NMSetting type which the hash contains properties for +

hash :

the GHashTable containing a string:GValue mapping of properties -that apply to the setting +that apply to the setting +

Returns :

-a new NMSetting object populated with the properties from the -hash table, or NULL on failure + a new NMSetting object populated with the properties from the +hash table, or NULL on failure +
-
+

nm_setting_duplicate ()

NMSetting *         nm_setting_duplicate                (NMSetting *setting);

@@ -488,19 +412,20 @@ Duplicates a

setting :

-the NMSetting to duplicate +the NMSetting to duplicate +

Returns :

-a new NMSetting containing the same properties and values as the -source NMSetting. [transfer full] + a new NMSetting containing the same properties and values as the +source NMSetting
-
+

nm_setting_get_name ()

const char *        nm_setting_get_name                 (NMSetting *setting);

@@ -516,14 +441,15 @@ Returns the type name of the Returns :

-a string containing the type name of the NMSetting object, -like 'ppp' or 'wireless' or 'wired'. + a string containing the type name of the NMSetting object, +like 'ppp' or 'wireless' or 'wired'. +
-
+

nm_setting_verify ()

gboolean            nm_setting_verify                   (NMSetting *setting,
                                                          GSList *all_settings,
@@ -539,12 +465,14 @@ failed validation, and in what way that property failed validation.
 
 
 
setting :

-the NMSetting to verify
+the NMSetting to verify
+
 
 
 
all_settings :

 a GSList of all settings in the connection from which setting
-came
+came
+
 
 
 
error :

@@ -553,14 +481,14 @@ came
 
 
 
Returns :

-
-TRUE if the setting is valid, FALSE if it is not
+ TRUE if the setting is valid, FALSE if it is not
+
-
+

enum NMSettingCompareFlags

typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
@@ -602,7 +530,7 @@ two connections.
-
+

nm_setting_compare ()

gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
@@ -622,7 +550,8 @@ for a description of each flag's behavior.
 
 
 
b :

-a second NMSetting to compare with the first
+a second NMSetting to compare with the first
+
 
 
 
flags :

@@ -631,14 +560,14 @@ for a description of each flag's behavior.
 
 
 
Returns :

-
-TRUE if the comparison succeeds, FALSE if it does not
+ TRUE if the comparison succeeds, FALSE if it does not
+
-
+

enum NMSettingDiffResult

typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
@@ -671,7 +600,7 @@ These values indicate the result of a setting difference operation.
-
+

nm_setting_diff ()

gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
@@ -695,7 +624,8 @@ one or more b :

-a second NMSetting to compare with the first
+a second NMSetting to compare with the first
+
 
 
 
flags :

@@ -705,11 +635,12 @@ one or more invert_results :

 this parameter is used internally by libnm-util and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
+
 
 
 
results :

-if the settings differ, on return a
+ if the settings differ, on return a
 hash table mapping the differing keys to one or more NMSettingDiffResult
 values OR-ed together.  If the settings do not differ, any hash table passed
 in is unmodified.  If no hash table is passed in, a new one is created. [element-type utf8 guint32]
@@ -717,14 +648,14 @@ in is unmodified.  If no hash table is passed in, a new one is created. 
 
 
Returns :

-
-TRUE if the settings contain the same values, FALSE if they do not
+ TRUE if the settings contain the same values, FALSE if they do not
+
-
+

nm_setting_enumerate_values ()

void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
@@ -743,18 +674,19 @@ user function for each property.
 
 
 
func :

-user-supplied function called for each property of the setting. [scope call]
+user-supplied function called for each property of the setting
 
 
 
 
user_data :

-user data passed to func at each invocation
+user data passed to func at each invocation
+
-
+

nm_setting_to_string ()

char *              nm_setting_to_string                (NMSetting *setting);

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

Returns :

-an allocated string containing a textual representation of the + an allocated string containing a textual representation of the setting's properties and values (including secrets!), which the caller should free with g_free() @@ -781,7 +713,7 @@ free with +

nm_setting_clear_secrets ()

void                nm_setting_clear_secrets            (NMSetting *setting);

@@ -799,7 +731,7 @@ leakage of information.

-
+

nm_setting_need_secrets ()

GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

@@ -818,17 +750,17 @@ is no way to conclusively determine exactly which secrets are needed.

Returns :

-a GPtrArray containing the property names of secrets of the + a GPtrArray containing the property names of secrets of the NMSetting which may be required; the caller owns the array and must free the each array element with g_free(), as well as the array -itself with g_ptr_array_free(). [transfer full][element-type utf8] +itself with g_ptr_array_free()
-
+

nm_setting_update_secrets ()

gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
@@ -848,106 +780,27 @@ setting (deserialized from D-Bus for example).
 
 
secrets :

 a GHashTable mapping string:GValue of setting property names and
-secrets
-
-
-
error :

-location to store error, or NULL
+secrets
 
 
 
-
Returns :

-
-TRUE if the secrets were successfully updated and the connection
-is valid, FALSE on failure or if the setting was never added to the connection
-
-
-
-
-
-
-

nm_setting_get_secret_flags ()

-
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);
-

-For a given secret, retrieves the NMSettingSecretFlags describing how to -handle that secret. -

-
-- - - - - - - - - - - - - - - - - -

setting :

the NMSetting -

secret_name :

the secret key name to get flags for

out_flags :

on success, the NMSettingSecretFlags for the secret

error :

 location to store error, or NULL

Returns :

TRUE on success (if the given secret name was a valid property of -this setting, and if that property is secret), FALSE if not
-
-
-
-

nm_setting_set_secret_flags ()

-
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags flags,
-                                                         GError **error);
-

-For a given secret, retrieves the NMSettingSecretFlags describing how to -handle that secret. -

-
-- - - - - - - - - - - - - - - - - - - -

setting :

the NMSetting -

secret_name :

the secret key name to set flags for

flags :

the NMSettingSecretFlags for the secret

error :

location to store error, or NULL + TRUE if the secrets were successfully updated and the connection +is valid, FALSE on failure or if the setting was never added to the connection

Returns :

TRUE on success (if the given secret name was a valid property of -this setting, and if that property is secret), FALSE if not
-
+

Property Details

-
+

The "name" property

  "name"                     gchar*                : Read / Write

@@ -961,6 +814,6 @@ example 'ppp' or 'wireless' or 'wired'.

- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.15
\ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index 8ef172c1..aec1b96e 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,15 +39,15 @@
-
+

Synopsis

-
+
 #include <nm-setting-8021x.h>
 
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
 #define             NM_SETTING_802_1X_SETTING_NAME
-enum                NMSetting8021xError;
+enum                NMSetting8021xError;
 #define             NM_TYPE_SETTING_802_1X_ERROR
 #define             NM_SETTING_802_1X_ERROR
 GQuark              nm_setting_802_1x_error_quark       (void);
@@ -66,15 +66,12 @@ enum                NM_SETTING_802_1X_PHASE2_CA_PATH
 #define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 #define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PIN
-#define             NM_SETTING_802_1X_PIN_FLAGS
+#define             NM_SETTING_802_1X_PSK
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
                     NMSetting8021x;
                     NMSetting8021xClass;
@@ -99,10 +96,8 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_ca_cert_path
-                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
                                                          NMSetting8021xCKScheme scheme,
@@ -110,9 +105,9 @@ const char *            GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_client_cert_path
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -130,9 +125,9 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -142,9 +137,9 @@ const char *            GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -153,15 +148,13 @@ const char *            NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_psk           (NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_private_key_blob
+const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_private_key_path
+const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -169,17 +162,15 @@ const char *            NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
+const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_private_key_path
+const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -188,27 +179,67 @@ const char *            NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
+const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
+enum                NMSetting8021xCKType;
+const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key
+                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);
+NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
+                                                        (NMSetting8021x *setting);
-
+

Object Hierarchy

-
-  GEnum
-   +----NMSetting8021xError
-
   GObject
    +----NMSetting
          +----NMSetting8021x
-
+

Properties

   "anonymous-identity"       gchar*                : Read / Write
@@ -218,7 +249,6 @@ const char *            eap"                      GSList_gchararray_*   : Read / Write
   "identity"                 gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
   "phase1-fast-provisioning" gchar*                : Read / Write
   "phase1-peaplabel"         gchar*                : Read / Write
   "phase1-peapver"           gchar*                : Read / Write
@@ -229,14 +259,12 @@ const char *            phase2-client-cert"       GArray_guchar_*       : Read / Write
   "phase2-private-key"       GArray_guchar_*       : Read / Write
   "phase2-private-key-password" gchar*                : Read / Write
-  "phase2-private-key-password-flags" guint                 : Read / Write
   "private-key"              GArray_guchar_*       : Read / Write
   "private-key-password"     gchar*                : Read / Write
-  "private-key-password-flags" guint                 : Read / Write
   "system-ca-certs"          gboolean              : Read / Write / Construct
-
+

Description

The NMSetting8021x object is a NMSetting subclass that describes @@ -267,9 +295,9 @@ following books. ISBN: 978-1587051548

-
+

Details

-
+

enum NMSetting8021xCKFormat

typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -279,39 +307,10 @@ following books.
 } NMSetting8021xCKFormat;

-NMSetting8021xCKFormat values indicate the general type of a certificate -or private key

-
-- - - - - - - - - - - - - - - - - - -

NM_SETTING_802_1X_CK_FORMAT_UNKNOWN

unknown file format -

NM_SETTING_802_1X_CK_FORMAT_X509

file contains an X.509 format certificate -

NM_SETTING_802_1X_CK_FORMAT_RAW_KEY

file contains an old-style OpenSSL PEM -or DER private key -

NM_SETTING_802_1X_CK_FORMAT_PKCS12

file contains a PKCS12 certificate -and private key -
-
+

enum NMSetting8021xCKScheme

typedef enum {
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -320,36 +319,10 @@ and private key
 } NMSetting8021xCKScheme;

-NMSetting8021xCKScheme values indicate how a certificate or private key is -stored in the setting properties, either as a blob of the item's data, or as -a path to a certificate or private key file on the filesystem

-
-- - - - - - - - - - - - - - -

NM_SETTING_802_1X_CK_SCHEME_UNKNOWN

unknown certificate or private key -scheme -

NM_SETTING_802_1X_CK_SCHEME_BLOB

certificate or key is stored as the raw -item data -

NM_SETTING_802_1X_CK_SCHEME_PATH

certificate or key is stored as a path -to a file containing the certificate or key data -
-
+

NM_SETTING_802_1X_SETTING_NAME

#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
@@ -357,7 +330,7 @@ to a file containing the certificate or key data

-
+

enum NMSetting8021xError

typedef enum
 {
@@ -370,7 +343,7 @@ to a file containing the certificate or key data
-
+

NM_TYPE_SETTING_802_1X_ERROR

#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ())
@@ -378,7 +351,7 @@ to a file containing the certificate or key data

-
+

NM_SETTING_802_1X_ERROR

#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
@@ -386,7 +359,7 @@ to a file containing the certificate or key data

-
+

nm_setting_802_1x_error_quark ()

GQuark              nm_setting_802_1x_error_quark       (void);

@@ -396,12 +369,13 @@ Registers an error quark for

Returns :

-the error quark used for NMSetting8021x errors. + the error quark used for NMSetting8021x errors. +
-
+

NM_SETTING_802_1X_EAP

#define NM_SETTING_802_1X_EAP "eap"
@@ -409,7 +383,7 @@ Registers an error quark for +

NM_SETTING_802_1X_IDENTITY

#define NM_SETTING_802_1X_IDENTITY "identity"
@@ -417,7 +391,7 @@ Registers an error quark for +

NM_SETTING_802_1X_ANONYMOUS_IDENTITY

#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
@@ -425,7 +399,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CA_CERT

#define NM_SETTING_802_1X_CA_CERT "ca-cert"
@@ -433,7 +407,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CA_PATH

#define NM_SETTING_802_1X_CA_PATH "ca-path"
@@ -441,7 +415,7 @@ Registers an error quark for +

NM_SETTING_802_1X_CLIENT_CERT

#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
@@ -449,7 +423,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_PEAPVER

#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
@@ -457,7 +431,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_PEAPLABEL

#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
@@ -465,7 +439,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
@@ -473,7 +447,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_AUTH

#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
@@ -481,7 +455,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_AUTHEAP

#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
@@ -489,7 +463,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CA_CERT

#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
@@ -497,7 +471,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CA_PATH

#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
@@ -505,7 +479,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_CLIENT_CERT

#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
@@ -513,7 +487,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PASSWORD

#define NM_SETTING_802_1X_PASSWORD "password"
@@ -521,15 +495,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
-
-

-

-
-
-
+

NM_SETTING_802_1X_PRIVATE_KEY

#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
@@ -537,7 +503,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
@@ -545,15 +511,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
-
-

-

-
-
-
+

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
@@ -561,7 +519,7 @@ Registers an error quark for +

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
@@ -569,15 +527,7 @@ Registers an error quark for -

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
-
-

-

-
-
-
+

NM_SETTING_802_1X_PIN

#define NM_SETTING_802_1X_PIN "pin"
@@ -585,15 +535,15 @@ Registers an error quark for -

NM_SETTING_802_1X_PIN_FLAGS

-
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+

+
NM_SETTING_802_1X_PSK

+
#define NM_SETTING_802_1X_PSK "psk"
 

 

 

 

 

-

+

 
NM_SETTING_802_1X_SYSTEM_CA_CERTS

 
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 

@@ -601,14 +551,14 @@ Registers an error quark for 
+

 
NMSetting8021x

 
typedef struct _NMSetting8021x NMSetting8021x;

 

 

 

 

-

+

 
NMSetting8021xClass

 
typedef struct {
 	NMSettingClass parent;
@@ -624,14 +574,22 @@ Registers an error quark for 
+

 
nm_setting_802_1x_get_type ()

 
GType               nm_setting_802_1x_get_type          (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_802_1x_new ()

 
NMSetting *         nm_setting_802_1x_new               (void);

 

@@ -641,12 +599,13 @@ Creates a new 
 
 
 
Returns :

-the new empty NMSetting8021x object
+ the new empty NMSetting8021x object
+
 
 

 

 

-

+

 
nm_setting_802_1x_get_num_eap_methods ()

 
guint32             nm_setting_802_1x_get_num_eap_methods
                                                         (NMSetting8021x *setting);

@@ -667,13 +626,14 @@ allowed EAP methods.
 
 
 
Returns :

-the number of allowed EAP methods
+ the number of allowed EAP methods
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_eap_method ()

 
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);

@@ -690,18 +650,19 @@ Returns the name of the allowed EAP method at index 
 
 
 
i :

-the index of the EAP method name to return
+the index of the EAP method name to return
+
 
 
 
Returns :

-the name of the allowed EAP method at index i
+ the name of the allowed EAP method at index i
 
 
 
 

 

 

-

+

 
nm_setting_802_1x_add_eap_method ()

 
gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);

@@ -720,18 +681,20 @@ allowed EAP methods.
 
 
 
eap :

-the name of the EAP method to allow for this connection
+the name of the EAP method to allow for this connection
+
 
 
 
Returns :

-TRUE if the EAP method was successfully added, FALSE if it was
-not a valid method or if it was already allowed.
+ TRUE if the EAP method was successfully added, FALSE if it was
+ not a valid method or if it was already allowed.
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_remove_eap_method ()

 
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
                                                          guint32 i);

@@ -748,13 +711,14 @@ Removes the allowed EAP method at the specified index.
 
 
 
i :

-the index of the EAP method to remove
+the index of the EAP method to remove
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_clear_eap_methods ()

 
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

 

@@ -770,7 +734,7 @@ Clears all allowed EAP methods.
 

 

 

-

+

 
nm_setting_802_1x_get_identity ()

 
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

 

@@ -787,13 +751,14 @@ authenticate the user.  Often this is a username or login name.
 
 
 
Returns :

-the user identifier
+ the user identifier
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_anonymous_identity ()

 
const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (NMSetting8021x *setting);

@@ -813,13 +778,14 @@ a secure form, if applicable for that EAP method.
 
 
 
Returns :

-the anonymous identifier
+ the anonymous identifier
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_system_ca_certs ()

 
gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);

@@ -841,13 +807,14 @@ of these properties.
 
 
 
Returns :

-TRUE if a system CA certificate path should be used, FALSE if not
+ TRUE if a system CA certificate path should be used, FALSE if not
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_path ()

 
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

 

@@ -867,13 +834,14 @@ certificates for verifying the network to client.
 
 
 
Returns :

-the CA certificate directory path
+ the CA certificate directory path
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_path ()

 
const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);

@@ -894,20 +862,21 @@ to add more CA certificates for verifying the network to client.
 
 
 
Returns :

-the "phase 2" CA certificate directory path
+ the "phase 2" CA certificate directory path
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the CA certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
 

 
@@ -919,19 +888,19 @@ if Returns :

-
+

 

scheme used to store the CA certificate (blob or path) scheme used to store the CA certificate (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
-                                                        (NMSetting8021x *setting);

+
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

 

 Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -947,19 +916,19 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

-the CA certificate data
+ the CA certificate data
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_path ()

-
const char *            nm_setting_802_1x_get_ca_cert_path
-                                                        (NMSetting8021x *setting);

+
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

 

 Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -975,13 +944,14 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

-path to the CA certificate file
+ path to the CA certificate file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_ca_cert ()

 
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
@@ -990,9 +960,9 @@ of the network cannot be confirmed by the client.
                                                          GError **error);

 

 Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 
@@ -1004,40 +974,45 @@ scheme, or with the path to the certificate file if using the
 
-
+
-
+
-
+
-
+
-
+

 

 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
-(PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the CA certificate.when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
+  (PEM or DER format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the CA certificate.
+
 

 

 
scheme :
desired storage scheme for the certificatedesired storage scheme for the certificate
+
 

 

 
out_format :
on successful return, the type of the certificate addedon successful return, the type of the certificate added
+
 

 

 
error :
on unsuccessful return, an erroron unsuccessful return, an error
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
 

 
@@ -1049,15 +1024,16 @@ if Returns :

-
+

 

scheme used to store the client certificate (blob or path) scheme used to store the client certificate (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1074,15 +1050,16 @@ authentication method.
 
 
 
Returns :

-the client certificate data
+ the client certificate data
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_path ()

-
const char *            nm_setting_802_1x_get_client_cert_path
+
const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1099,13 +1076,14 @@ authentication method.
 
 
 
Returns :

-path to the client certificate file
+ path to the client certificate file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_client_cert ()

 
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1115,8 +1093,8 @@ authentication method.
 

 Reads a certificate from disk and sets the "client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 

 Client certificates are used to identify the connecting client to the network
@@ -1133,33 +1111,38 @@ authentication method.
 
 
 
value :

-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
-file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the client certificate.
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
+  file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the client certificate.
+
 
 
 
scheme :

-desired storage scheme for the certificate
+desired storage scheme for the certificate
+
 
 
 
out_format :

-on successful return, the type of the certificate added
+on successful return, the type of the certificate added
+
 
 
 
error :

-on unsuccessful return, an error
+on unsuccessful return, an error
+
 
 
 
Returns :

-TRUE if the operation succeeded, FALSE if it was unsuccessful
+ TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_peapver ()

 
const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);

@@ -1173,15 +1156,16 @@ clears the client certificate.
 
 
 
Returns :

-the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the "phase1-peapver" property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+ the "phase 1" PEAP version to be used when authenticating with
+ EAP-PEAP as contained in the "phase1-peapver" property.  Valid
+ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_peaplabel ()

 
const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);

@@ -1195,17 +1179,18 @@ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
 
 
 
Returns :

-whether the "phase 1" PEAP label is new-style or old-style, to be
-used when authenticating with EAP-PEAP, as contained in the
-"phase1-peaplabel" property.  Valid values are NULL (unset),
-"0" (use old-style label), and "1" (use new-style label).  See the
-wpa_supplicant documentation for more details.
+ whether the "phase 1" PEAP label is new-style or old-style, to be
+ used when authenticating with EAP-PEAP, as contained in the
+ "phase1-peaplabel" property.  Valid values are NULL (unset),
+ "0" (use old-style label), and "1" (use new-style label).  See the
+ wpa_supplicant documentation for more details.
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_fast_provisioning ()

 
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);

@@ -1219,15 +1204,16 @@ wpa_supplicant documentation for more details.
 
 
 
Returns :

-whether "phase 1" PEAP fast provisioning should be used, as specified
-by the "phase1-fast-provisioning" property.  See the
-wpa_supplicant documentation for more details.
+ whether "phase 1" PEAP fast provisioning should be used, as specified
+ by the "phase1-fast-provisioning" property.  See the
+ wpa_supplicant documentation for more details.
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_auth ()

 
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

 

@@ -1240,14 +1226,15 @@ wpa_supplicant documentation for more details.
-
+

 
 

 
Returns :
the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the "phase2-auth" property. the "phase 2" non-EAP (ex MD5) allowed authentication method as
+  specified by the "phase2-auth" property.
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_autheap ()

 
const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);

@@ -1261,21 +1248,22 @@ specified by the Returns :

-the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.
+ the "phase 2" EAP-based (ex TLS) allowed authentication method as
+  specified by the "phase2-autheap" property.
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().
 

 

@@ -1288,19 +1276,20 @@ use Returns :

-
+
scheme used to store the "phase 2" CA certificate (blob or path) scheme used to store the "phase 2" CA certificate (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);

 

 Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1316,19 +1305,20 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

-the "phase 2" CA certificate data
+ the "phase 2" CA certificate data
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_path ()

-
const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+
const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);

 

 Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1344,13 +1334,14 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

-path to the "phase 2" CA certificate file
+ path to the "phase 2" CA certificate file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_ca_cert ()

 
gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -1361,8 +1352,8 @@ of the network cannot be confirmed by the client.
 

 Reads a certificate from disk and sets the "phase2-ca-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 
@@ -1374,41 +1365,46 @@ file if using the value :

-
+
-
+
-
+
-
+
-
+

 

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
-certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the "phase2" CA certificate.when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
+  certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the "phase2" CA certificate.
+
 

 

 
scheme :
desired storage scheme for the certificatedesired storage scheme for the certificate
+
 

 

 
out_format :
on successful return, the type of the certificate addedon successful return, the type of the certificate added
+
 

 

 
error :
on unsuccessful return, an erroron unsuccessful return, an error
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1421,15 +1417,16 @@ returned scheme is Returns :

-
+
scheme used to store the "phase 2" client certificate (blob or path) scheme used to store the "phase 2" client certificate (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
+
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1446,15 +1443,16 @@ authentication method.
 
 
 
Returns :

-the "phase 2" client certificate data
+ the "phase 2" client certificate data
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *            nm_setting_802_1x_get_phase2_client_cert_path
+
const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1471,13 +1469,14 @@ authentication method.
 
 
 
Returns :

-path to the "phase 2" client certificate file
+ path to the "phase 2" client certificate file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_client_cert ()

 
gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -1488,8 +1487,8 @@ authentication method.
 

 Reads a certificate from disk and sets the "phase2-client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 

 Client certificates are used to identify the connecting client to the network
@@ -1506,33 +1505,38 @@ authentication method.
 
 
 
value :

-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the "phase2" client certificate.
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
+  certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+  encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+  any scheme clears the "phase2" client certificate.
+
 
 
 
scheme :

-desired storage scheme for the certificate
+desired storage scheme for the certificate
+
 
 
 
out_format :

-on successful return, the type of the certificate added
+on successful return, the type of the certificate added
+
 
 
 
error :

-on unsuccessful return, an error
+on unsuccessful return, an error
+
 
 
 
Returns :

-TRUE if the operation succeeded, FALSE if it was unsuccessful
+ TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_password ()

 
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

 

@@ -1545,35 +1549,15 @@ any scheme clears the "phase2" client ce
 
-
-
-
-

 

 
Returns :
the password used by the authentication method, if any, as specified
-by the "password" property

-

-

-

-
nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);

-

--
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
+ the password used by the authentication method, if any, as specified
+  by the "password" property
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_pin ()

 
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

 

@@ -1586,16 +1570,17 @@ by the 
 
-
+

 
Returns :
the PIN used by the authentication method, if any, as specified
-by the "pin" property the PIN used by the authentication method, if any, as specified
+  by the "pin" property
+
 

 
 

 

 

-

-
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);

+

+
nm_setting_802_1x_get_psk ()

+
const char *        nm_setting_802_1x_get_psk           (NMSetting8021x *setting);

 

@@ -1606,23 +1591,23 @@ by the "pin" property
-

 
 
 
 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"pin"
+ the Pre-Shared-Key used by the authentication method, if any, as
+  specified by the "psk" property
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the private key.  If the returned scheme is
-NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1635,26 +1620,22 @@ Returns the scheme used to store the private key.  If the returned scheme is
 
-
+

 

 
Returns :
scheme used to store the private key (blob or path) scheme used to store the private key (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *      nm_setting_802_1x_get_private_key_blob
+
const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

-

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
-

 

@@ -1665,15 +1646,16 @@ keys should always be encrypted with a private key password.
 
-
+

 
 
 

 
Returns :
the private key data the private key data
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_path ()

-
const char *            nm_setting_802_1x_get_private_key_path
+
const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
@@ -1690,13 +1672,14 @@ authentication method.
 
 
 
Returns :

-path to the private key file
+ path to the private key file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_private_key ()

 
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1705,31 +1688,16 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

+Reads a private key from disk and sets the "private-key"
+property with the raw private key data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

-

-This function reads a private key from disk and sets the
-"private-key" property with the private key file data if using
-the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
-key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"private-key-password" property with the given password.  If
-the decryption is unsuccessful, FALSE is returned, error is set, and no
-internal data is changed.  If no password is given, the private key is
-assumed to be valid, no decryption is performed, and the password may be set
-at a later time.
-

-

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
-

 

@@ -1740,64 +1708,45 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-

 
 
 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
-(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the private key.when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
+  (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+  clears the private key.
+
 

 

 
password :
password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.password used to decrypt the private key
+
 

 

 
scheme :
desired storage scheme for the private keydesired storage scheme for the private key
+
 

 

 
out_format :
on successful return, the type of the private key addedon successful return, the type of the private key added
+
 

 

 
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful

-

-

-

-
nm_setting_802_1x_get_private_key_password ()

-
const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);

-

--
-
-
-
-
+


setting :
the NMSetting8021x
+on unsuccessful return, an error
 
 

 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_private_key_from_file(),
-nm_setting_802_1x_set_private_key_path(), or the
-"private-key-password" property. TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 

 
 

 

 

-

-
nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
+

+
nm_setting_802_1x_get_private_key_password ()

+
const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);

 
@@ -1809,15 +1758,17 @@ previously set with nm_setting_802_1x_set_private_key_fro
 
 
-

 


 
Returns :
the NMSettingSecretFlags pertaining to the
-"private-key-password"
+ the private key password used to decrypt the private key if
+ previously set with nm_setting_802_1x_set_private_key_from_file(),
+ nm_setting_802_1x_set_private_key_path(), or the
+ "private-key-password" property.
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_format ()

 
NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);

@@ -1831,22 +1782,23 @@ previously set with nm_setting_802_1x_set_private_key_fro
 
 
 
Returns :

-the data format of the private key data stored in the
-"private-key" property
+ the data format of the private key data stored in the
+  "private-key" property
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1859,26 +1811,22 @@ scheme is Returns :

-
+
scheme used to store the "phase 2" private key (blob or path) scheme used to store the "phase 2" private key (blob or path)
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
+
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

-

-WARNING: the phase2 private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
-

 

@@ -1889,15 +1837,16 @@ keys should always be encrypted with a private key password.
 
-
+

 
 
 

 
Returns :
the "phase 2" private key data the "phase 2" private key data
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *            nm_setting_802_1x_get_phase2_private_key_path
+
const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
@@ -1914,13 +1863,14 @@ authentication method.
 
 
 
Returns :

-path to the "phase 2" private key file
+ path to the "phase 2" private key file
+
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_private_key ()

 
gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -1930,31 +1880,16 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

+Reads a "phase 2" private key from disk and sets the
+"phase2-private-key" property with the raw private key data if
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
+private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

-

-This function reads a private key from disk and sets the
-"phase2-private-key" property with the private key file data if
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
-private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"phase2-private-key-password" property with the given
-password.  If the decryption is unsuccessful, FALSE is returned, error is
-set, and no internal data is changed.  If no password is given, the private
-key is assumed to be valid, no decryption is performed, and the password may
-be set at a later time.
-

-

-WARNING: the "phase2" private key property is not a "secret" property, and
-thus unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
-

 

@@ -1965,41 +1900,45 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
+
-
+
-
+
-
+
-
+
-
+

 
 
 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
-key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
-scheme clears the private key.when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private 
+  key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
+  use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+  scheme clears the "phase2" private key.
+
 

 

 
password :
password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.password used to decrypt the private key
+
 

 

 
scheme :
desired storage scheme for the private keydesired storage scheme for the private key
+
 

 

 
out_format :
on successful return, the type of the private key addedon successful return, the type of the private key added
+
 

 

 
error :
on unsuccessful return, an erroron unsuccessful return, an error
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful TRUE if the operation succeeded, FALSE if it was unsuccessful
+
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *            nm_setting_802_1x_get_phase2_private_key_password
+
const char *        nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);

 
@@ -2011,18 +1950,19 @@ an error is returned.
-
+

 

 
 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
-nm_setting_802_1x_set_phase2_private_key_path(), or the
-"phase2-private-key-password" property. the private key password used to decrypt the private key if
+ previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
+ nm_setting_802_1x_set_phase2_private_key_path(), or the
+ "phase2-private-key-password" property.
+
 

 
 

 

 

-

-
nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
+

+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);

 
@@ -2034,18 +1974,44 @@ previously set with nm_setting_802_1x_set_phase2_private_
 
 
-

 


 
Returns :
the NMSettingSecretFlags pertaining to the
-"phase2-private-key-password"
+ the data format of the "phase 2" private key data stored in the
+  "phase2-private-key" property
 
 

 
 

 

 

-

-
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);

+

+
enum NMSetting8021xCKType

+
typedef enum {
+	NM_SETTING_802_1X_CK_TYPE_UNKNOWN = 0,
+	NM_SETTING_802_1X_CK_TYPE_X509,
+	NM_SETTING_802_1X_CK_TYPE_RAW_KEY,
+	NM_SETTING_802_1X_CK_TYPE_PKCS12
+} NMSetting8021xCKType;
+

+

+

+

+

+

+
nm_setting_802_1x_get_ca_cert ()

+
const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_ca_cert_blob().

+

+

+Returns the CA certificate blob if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
+

 

@@ -2056,50 +2022,605 @@ previously set with nm_setting_802_1x_set_phase2_private_
 
 
-
+

 
 

 
Returns :
the data format of the "phase 2" private key data stored in the
-"phase2-private-key" property the CA certificate data
+
 

 
 

 

-

-

-
Property Details

-

-
The "anonymous-identity" property

-
  "anonymous-identity"       gchar*                : Read / Write

-

-Anonymous identity string for EAP authentication methods.  Used as the
-unencrypted identity with EAP types that support different tunneled
-identity like EAP-TTLS.
-

-
Default value: NULL

-

 

-

-
The "ca-cert" property

-
  "ca-cert"                  GArray_guchar_*       : Read / Write

-

-Contains the CA certificate if used by the EAP method specified in the
-"eap" property.  Setting this property directly is
-discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
-

+

+
nm_setting_802_1x_set_ca_cert_from_file ()

+
gboolean            nm_setting_802_1x_set_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_ca_cert() with the
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

 

-

-

-
The "ca-path" property

-
  "ca-path"                  gchar*                : Read / Write

 

-UTF-8 encoded path to a directory containing PEM or DER formatted
-certificates to be added to the verification chain in addition to the
-certificate specified in the "ca-cert" property.
+Reads a certificate from disk and sets the "ca-cert" property
+with the raw certificate data using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+scheme.
+

+

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


setting :
the NMSetting8021x
+
filename :
the path of the CA certificate file (PEM or DER format). Passing
+  NULL clears the CA certificate.
+
out_ck_type :
on successful return, the type of the certificate added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_client_cert ()

+
const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_client_cert_blob().

+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
Returns :
 the client certificate data
+

+

+

+

+
nm_setting_802_1x_set_client_cert_from_file ()

+
gboolean            nm_setting_802_1x_set_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_client_cert() with the
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+

+Reads a certificate from disk and sets the "client-cert"
+property with the raw certificate data.
+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
filename :
the path of the client certificate file (PEM, DER, or
+  PKCS12 format).  Passing NULL clears the client certificate.
+
out_ck_type :
on successful return, the type of the certificate added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_phase2_ca_cert ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
+                                                        (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_phase2_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_ca_cert_blob().

+

+

+Returns the "phase 2" CA certificate blob.  Not all EAP methods use
+a CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
+

+

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


setting :
the NMSetting8021x
+
Returns :
 the "phase 2" CA certificate data
+

+

+

+

+
nm_setting_802_1x_set_phase2_ca_cert_from_file ()

+
gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_phase2_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_ca_cert().
+  with the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+

+Reads a certificate from disk and sets the "phase2-ca-cert"
+property with the raw certificate data.
+

+

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


setting :
the NMSetting8021x
+
filename :
the path of the "phase2" CA certificate file (PEM or DER format).
+  Passing NULL with any scheme clears the "phase2" CA certificate.
+
out_ck_type :
on successful return, the type of the certificate added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_phase2_client_cert ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
+                                                        (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_phase2_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_client_cert_blob().

+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
Returns :
 the "phase 2" client certificate data
+

+

+

+

+
nm_setting_802_1x_set_phase2_client_cert_from_file ()

+
gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_phase2_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_client_cert() with the.
+  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+

+Reads a certificate from disk and sets the "phase2-client-cert"
+property with the raw certificate data.
+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
filename :
pass the path of the "phase2" client certificate file (PEM, DER,
+  or PKCS12 format).  Passing NULL clears the "phase2" client certificate.
+
out_ck_type :
on successful return, the type of the certificate added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_private_key ()

+
const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_blob().

+

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
Returns :
 the private key data
+

+

+

+

+
nm_setting_802_1x_set_private_key_from_file ()

+
gboolean            nm_setting_802_1x_set_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_private_key() with.
+  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+

+Reads a private key from disk and sets the "private-key"
+property with the raw private key data.
 

-
Default value: NULL

-

-

-

-
The "client-cert" property

-
  "client-cert"              GArray_guchar_*       : Read / Write

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
filename :
the path of the private key file (PEM, DER, or PKCS12 format).
+  Passing NULL clears the private key.
+
password :
password used to decrypt the private key
+
out_ck_type :
on successful return, the type of the private key added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_private_key_type ()

+
NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
+                                                        (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_format().

+

+

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


setting :
the NMSetting8021x
+
Returns :
 the data format of the private key data stored in the
+  "private-key" property
+

+

+

+

+
nm_setting_802_1x_get_phase2_private_key ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_private_key
+                                                        (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_phase2_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_private_key_blob().

+

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
Returns :
 the "phase 2" private key data
+

+

+

+

+
nm_setting_802_1x_set_phase2_private_key_from_file ()

+
gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
+                                                        (NMSetting8021x *setting,
+                                                         const char *filename,
+                                                         const char *password,
+                                                         NMSetting8021xCKType *out_ck_type,
+                                                         GError **error);

+

+
Warning

+
nm_setting_802_1x_set_phase2_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_set_phase2_private_key() with
+  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+

+Reads a "phase 2" private key from disk and sets the
+"phase2-private-key" property with the raw private key data.
+

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

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


setting :
the NMSetting8021x
+
filename :
the path of the "phase2" private key file (PEM, DER, or PKCS12
+  format).  Passing NULL clears the "phase2" private key.
+
password :
password used to decrypt the private key
+
out_ck_type :
on successful return, the type of the private key added
+
error :
on unsuccessful return, an error
+
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
+

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_type ()

+
NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
+                                                        (NMSetting8021x *setting);

+

+
Warning

+
nm_setting_802_1x_get_phase2_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
+  not be used in newly written code. Calling this function is
+  equivalent to calling nm_setting_802_1x_get_phase2_private_key_format().

+

+

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


setting :
the NMSetting8021x
+
Returns :
 the data format of the private key data stored in the
+  "phase2-private-key" property
+

+

+

+

+
Property Details

+

+
The "anonymous-identity" property

+
  "anonymous-identity"       gchar*                : Read / Write

+

+Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.
+

+
Default value: NULL

+

+

+

+
The "ca-cert" property

+
  "ca-cert"                  GArray_guchar_*       : Read / Write

+

+Contains the CA certificate if used by the EAP method specified in the
+"eap" property.  Setting this property directly is
+discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
+

+

+

+

+
The "ca-path" property

+
  "ca-path"                  gchar*                : Read / Write

+

+UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the "ca-cert" property.
+

+
Default value: NULL

+

+

+

+
The "client-cert" property

+
  "client-cert"              GArray_guchar_*       : Read / Write

 

 Contains the client certificate if used by the EAP method specified in
 the "eap" property.  Setting this property directly is
@@ -2107,7 +2628,7 @@ discouraged; use the 
+

 
The "eap" property

 
  "eap"                      GSList_gchararray_*   : Read / Write

 

@@ -2119,7 +2640,7 @@ allowed combinations.
 

 

 

-

+

 
The "identity" property

 
  "identity"                 gchar*                : Read / Write

 

@@ -2129,7 +2650,7 @@ user or login name.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -2138,17 +2659,7 @@ Password used for EAP authentication methods.
 
Default value: NULL

 

 

-

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "phase1-fast-provisioning" property

 
  "phase1-fast-provisioning" gchar*                : Read / Write

 

@@ -2162,7 +2673,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase1-peaplabel" property

 
  "phase1-peaplabel"         gchar*                : Read / Write

 

@@ -2174,7 +2685,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase1-peapver" property

 
  "phase1-peapver"           gchar*                : Read / Write

 

@@ -2188,7 +2699,7 @@ version.
 
Default value: NULL

 

 

-

+

 
The "phase2-auth" property

 
  "phase2-auth"              gchar*                : Read / Write

 

@@ -2202,7 +2713,7 @@ authentication; see the wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase2-autheap" property

 
  "phase2-autheap"           gchar*                : Read / Write

 

@@ -2216,7 +2727,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase2-ca-cert" property

 
  "phase2-ca-cert"           GArray_guchar_*       : Read / Write

 

@@ -2227,7 +2738,7 @@ Setting this property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-ca-path" property

 
  "phase2-ca-path"           gchar*                : Read / Write

 

@@ -2238,7 +2749,7 @@ certificate specified in the 
+

 
The "phase2-client-cert" property

 
  "phase2-client-cert"       GArray_guchar_*       : Read / Write

 

@@ -2249,7 +2760,7 @@ properties.  Setting this property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-private-key" property

 
  "phase2-private-key"       GArray_guchar_*       : Read / Write

 

@@ -2263,7 +2774,7 @@ property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-private-key-password" property

 
  "phase2-private-key-password" gchar*                : Read / Write

 

@@ -2277,17 +2788,7 @@ the private key by the 
-
The "phase2-private-key-password-flags" property

-
  "phase2-private-key-password-flags" guint                 : Read / Write

-

-Flags indicating how to handle "phase2-private-key-password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "private-key" property

 
  "private-key"              GArray_guchar_*       : Read / Write

 

@@ -2295,16 +2796,9 @@ Contains the private key if the nm_setting_802_1x_set_private_key() function instead.
 

-

-WARNING: "private-key" is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a
-private key password to prevent unauthorized access to unencrypted
-private key data.
-

 

 

-

+

 
The "private-key-password" property

 
  "private-key-password"     gchar*                : Read / Write

 

@@ -2318,17 +2812,7 @@ the private key by the 
-
The "private-key-password-flags" property

-
  "private-key-password-flags" guint                 : Read / Write

-

-Flags indicating how to handle "private-key-password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "system-ca-certs" property

 
  "system-ca-certs"          gboolean              : Read / Write / Construct

 

@@ -2346,6 +2830,6 @@ addition to any certificates specified by the 
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index a6eae7b9..0dabd239 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_BLUETOOTH_SETTING_NAME
-enum                NMSettingBluetoothError;
+
#define             NM_SETTING_BLUETOOTH_SETTING_NAME
+enum                NMSettingBluetoothError;
 #define             NM_TYPE_SETTING_BLUETOOTH_ERROR
 #define             NM_SETTING_BLUETOOTH_ERROR
 GQuark              nm_setting_bluetooth_error_quark    (void);
@@ -59,33 +59,29 @@ const char *        NMSettingBluetooth *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingBluetoothError
-

 
   GObject
    +----NMSetting
          +----NMSettingBluetooth
 

 

-

+

 
Properties

 
   "bdaddr"                   GArray_guchar_*       : Read / Write
   "type"                     gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

@@ -93,7 +89,7 @@ const char *        
+

 
enum NMSettingBluetoothError

 
typedef enum
 {
@@ -107,7 +103,7 @@ const char *        
+

 
NM_TYPE_SETTING_BLUETOOTH_ERROR

 
#define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ()) 
 

@@ -115,7 +111,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_ERROR

 
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 

@@ -123,14 +119,22 @@ const char *        
+

 
nm_setting_bluetooth_error_quark ()

 
GQuark              nm_setting_bluetooth_error_quark    (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_BLUETOOTH_BDADDR

 
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

@@ -138,7 +142,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE

 
#define NM_SETTING_BLUETOOTH_TYPE      "type"
 

@@ -146,7 +150,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE_DUN

 
#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
 

@@ -154,7 +158,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE_PANU

 
#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 

@@ -162,14 +166,14 @@ const char *        
+

 
NMSettingBluetooth

 
typedef struct _NMSettingBluetooth NMSettingBluetooth;

 

 

 

 

-

+

 
NMSettingBluetoothClass

 
typedef struct {
 	NMSettingClass parent;
@@ -185,38 +189,84 @@ const char *        
+

 
nm_setting_bluetooth_get_type ()

 
GType               nm_setting_bluetooth_get_type       (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_bluetooth_new ()

 
NMSetting *         nm_setting_bluetooth_new            (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_bluetooth_get_bdaddr ()

 
const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_bluetooth_get_connection_type ()

 
const char *        nm_setting_bluetooth_get_connection_type
                                                         (NMSettingBluetooth *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "bdaddr" property

 
  "bdaddr"                   GArray_guchar_*       : Read / Write

 

@@ -224,7 +274,7 @@ The Bluetooth address of the device.
 

 

 

-

+

 
The "type" property

 
  "type"                     gchar*                : Read / Write

 

@@ -237,6 +287,6 @@ Either 'dun' for Dial-Up Networking connections (not yet supported) or
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 3dc4a712..1704380c 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,20 +39,19 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting-cdma.h>
 
 #define             NM_SETTING_CDMA_SETTING_NAME
-enum                NMSettingCdmaError;
+enum                NMSettingCdmaError;
 #define             NM_TYPE_SETTING_CDMA_ERROR
 #define             NM_SETTING_CDMA_ERROR
 GQuark              nm_setting_cdma_error_quark         (void);
 #define             NM_SETTING_CDMA_NUMBER
 #define             NM_SETTING_CDMA_USERNAME
 #define             NM_SETTING_CDMA_PASSWORD
-#define             NM_SETTING_CDMA_PASSWORD_FLAGS
                     NMSettingCdma;
                     NMSettingCdmaClass;
 GType               nm_setting_cdma_get_type            (void);
@@ -60,32 +59,25 @@ enum                char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
-NMSettingSecretFlags  nm_setting_cdma_get_password_flags
-                                                        (NMSettingCdma *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingCdmaError
-

 
   GObject
    +----NMSetting
          +----NMSettingCdma
 

 

-

+

 
Properties

 
   "number"                   gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 The NMSettingCdma object is a NMSetting subclass that describes
@@ -93,9 +85,9 @@ properties that allow connections to IS-95-based mobile broadband
 networks, including those using CDMA2000/EVDO technology.
 

 

-

+

 
Details

-

+

 
NM_SETTING_CDMA_SETTING_NAME

 
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

@@ -103,7 +95,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
enum NMSettingCdmaError

 
typedef enum
 {
@@ -117,7 +109,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
NM_TYPE_SETTING_CDMA_ERROR

 
#define NM_TYPE_SETTING_CDMA_ERROR (nm_setting_cdma_error_get_type ()) 
 

@@ -125,7 +117,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
NM_SETTING_CDMA_ERROR

 
#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
 

@@ -133,7 +125,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
nm_setting_cdma_error_quark ()

 
GQuark              nm_setting_cdma_error_quark         (void);

 

@@ -143,51 +135,44 @@ Registers an error quark for 
 
 
Returns :

-the error quark used for NMSettingCdma errors.
+ the error quark used for NMSettingCdma errors.
+
 
 

 

 

-

+

 
NM_SETTING_CDMA_NUMBER

-
#define NM_SETTING_CDMA_NUMBER         "number"
+
#define NM_SETTING_CDMA_NUMBER       "number"
 

 

 

 

 

-

+

 
NM_SETTING_CDMA_USERNAME

-
#define NM_SETTING_CDMA_USERNAME       "username"
+
#define NM_SETTING_CDMA_USERNAME     "username"
 

 

 

 

 

-

+

 
NM_SETTING_CDMA_PASSWORD

-
#define NM_SETTING_CDMA_PASSWORD       "password"
-

-

-

-

-

-

-
NM_SETTING_CDMA_PASSWORD_FLAGS

-
#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
+
#define NM_SETTING_CDMA_PASSWORD     "password"
 

 

 

 

 

-

+

 
NMSettingCdma

 
typedef struct _NMSettingCdma NMSettingCdma;

 

 

 

 

-

+

 
NMSettingCdmaClass

 
typedef struct {
 	NMSettingClass parent;
@@ -203,14 +188,22 @@ Registers an error quark for 
+

 
nm_setting_cdma_get_type ()

 
GType               nm_setting_cdma_get_type            (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_cdma_new ()

 
NMSetting *         nm_setting_cdma_new                 (void);

 

@@ -220,12 +213,13 @@ Creates a new 
 
 
Returns :

-the new empty NMSettingCdma object
+ the new empty NMSettingCdma object
+
 
 

 

 

-

+

 
nm_setting_cdma_get_number ()

 
const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);

 

@@ -238,13 +232,14 @@ Creates a new 
 
-
+

 
Returns :
the "number" property of the setting the "number" property of the setting
+
 

 
 

 

 

-

+

 
nm_setting_cdma_get_username ()

 
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

 

@@ -257,13 +252,14 @@ Creates a new 
 
-
+

 
Returns :
the "username" property of the setting the "username" property of the setting
+
 

 
 

 

 

-

+

 
nm_setting_cdma_get_password ()

 
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

 

@@ -276,36 +272,16 @@ Creates a new 
 
-
-
-
-

 
Returns :
the "password" property of the setting

-

-

-

-
nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_cdma_get_password_flags
-                                                        (NMSettingCdma *setting);

-

--
-
-
-
-
-
-
-


setting :
the NMSettingCdma
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
+ the "password" property of the setting
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "number" property

 
  "number"                   gchar*                : Read / Write

 

@@ -316,7 +292,7 @@ is used when required.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -327,17 +303,7 @@ password is required, it is specified here.
 
Default value: NULL

 

 

-

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -351,6 +317,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 27c30ebd..b84ed1bf 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,13 +39,13 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting-connection.h>
 
 #define             NM_SETTING_CONNECTION_SETTING_NAME
-enum                NMSettingConnectionError;
+enum                NMSettingConnectionError;
 #define             NM_TYPE_SETTING_CONNECTION_ERROR
 #define             NM_SETTING_CONNECTION_ERROR
 GQuark              nm_setting_connection_error_quark   (void);
@@ -55,7 +55,6 @@ enum                NM_SETTING_CONNECTION_AUTOCONNECT
 #define             NM_SETTING_CONNECTION_TIMESTAMP
 #define             NM_SETTING_CONNECTION_READ_ONLY
-#define             NM_SETTING_CONNECTION_PERMISSIONS
                     NMSettingConnection;
                     NMSettingConnectionClass;
 GType               nm_setting_connection_get_type      (void);
@@ -68,63 +67,39 @@ const char *        NMSettingConnection *setting);
 guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);
-gboolean            nm_setting_connection_get_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx,
-                                                         const char **out_ptype,
-                                                         const char **out_pitem,
-                                                         const char **out_detail);
-gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);
-gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);
-void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingConnectionError
-

 
   GObject
    +----NMSetting
          +----NMSettingConnection
 

 

-

+

 
Properties

 
   "autoconnect"              gboolean              : Read / Write / Construct
   "id"                       gchar*                : Read / Write
-  "permissions"              GSList_gchararray_*   : Read / Write
   "read-only"                gboolean              : Read / Write / Construct
   "timestamp"                guint64               : Read / Write / Construct
   "type"                     gchar*                : Read / Write
   "uuid"                     gchar*                : Read / Write
 

 

-

+

 
Description

 

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

 

-

+

 
Details

-

+

 
NM_SETTING_CONNECTION_SETTING_NAME

 
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

@@ -132,7 +107,7 @@ a 
 

 

-

+

 
enum NMSettingConnectionError

 
typedef enum
 {
@@ -170,14 +145,14 @@ Describes errors that may result from operations involving a
 
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND

 the NMSetting object
   referenced by the setting name contained in the
-  "type" property was not present in the NMConnection
+  "type" property was not present in the NMConnection
 
 
 
 

 

 

-

+

 
NM_TYPE_SETTING_CONNECTION_ERROR

 
#define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ()) 
 

@@ -185,7 +160,7 @@ Describes errors that may result from operations involving a
 

 

 

-

+

 
NM_SETTING_CONNECTION_ERROR

 
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 

@@ -193,7 +168,7 @@ Describes errors that may result from operations involving a
 

 

 

-

+

 
nm_setting_connection_error_quark ()

 
GQuark              nm_setting_connection_error_quark   (void);

 

@@ -203,12 +178,13 @@ Registers an error quark for 
 
 
Returns :

-the error quark used for NMSettingConnection errors.
+ the error quark used for NMSettingConnection errors.
+
 
 

 

 

-

+

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID          "id"
 

@@ -216,7 +192,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_UUID

 
#define NM_SETTING_CONNECTION_UUID        "uuid"
 

@@ -224,7 +200,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_TYPE

 
#define NM_SETTING_CONNECTION_TYPE        "type"
 

@@ -232,7 +208,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_AUTOCONNECT

 
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 

@@ -240,7 +216,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_TIMESTAMP

 
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 

@@ -248,7 +224,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_READ_ONLY

 
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
 

@@ -256,15 +232,7 @@ Registers an error quark for 
 

 

-

-
NM_SETTING_CONNECTION_PERMISSIONS

-
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
-

-

-

-

-

-

+

 
NMSettingConnection

 
typedef struct _NMSettingConnection NMSettingConnection;

 

@@ -273,7 +241,7 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
NMSettingConnectionClass

 
typedef struct {
 	NMSettingClass parent;
@@ -289,14 +257,22 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
nm_setting_connection_get_type ()

 
GType               nm_setting_connection_get_type      (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_connection_new ()

 
NMSetting *         nm_setting_connection_new           (void);

 

@@ -306,12 +282,13 @@ Creates a new 
 
 
Returns :

-the new empty NMSettingConnection object
+ the new empty NMSettingConnection object
+
 
 

 

 

-

+

 
nm_setting_connection_get_id ()

 
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

 

@@ -327,13 +304,14 @@ Returns the Returns :

-the connection ID
+ the connection ID
+
 
 
 

 

 

-

+

 
nm_setting_connection_get_uuid ()

 
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

 

@@ -349,13 +327,14 @@ Returns the Returns :

-the connection UUID
+ the connection UUID
+
 
 
 

 

 

-

+

 
nm_setting_connection_get_connection_type ()

 
const char *        nm_setting_connection_get_connection_type
                                                         (NMSettingConnection *setting);

@@ -372,13 +351,14 @@ Returns the Returns :

-the connection type
+ the connection type
+
 
 
 

 

 

-

+

 
nm_setting_connection_get_autoconnect ()

 
gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);

@@ -395,13 +375,14 @@ Returns the Returns :

-the connection's autoconnect behavior
+ the connection's autoconnect behavior
+
 
 
 

 

 

-

+

 
nm_setting_connection_get_timestamp ()

 
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

@@ -417,13 +398,14 @@ Returns the Returns :

-the connection's timestamp
+ the connection's timestamp
+
 
 
 

 

 

-

+

 
nm_setting_connection_get_read_only ()

 
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

 

@@ -439,184 +421,16 @@ Returns the Returns :

-
-TRUE if the connection is read-only, FALSE if it is not
-
-
-

-

-

-

-
nm_setting_connection_get_num_permissions ()

-
guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);

-

-Returns the number of entires in the "permissions"
-property of this setting.
-

-

--
-
-
-
-
-
-
-


setting :
the NMSettingConnection
+ TRUE if the connection is read-only, FALSE if it is not
 
 
Returns :
the number of permissions entires

 
 

 

-

-

-
nm_setting_connection_get_permission ()

-
gboolean            nm_setting_connection_get_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx,
-                                                         const char **out_ptype,
-                                                         const char **out_pitem,
-                                                         const char **out_detail);

-

-Retrieve one of the entries of the "permissions" property
-of this setting.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingConnection
-
idx :
the zero-based index of the permissions entry
out_ptype :
on return, the permission type (at this time, always "user")
out_pitem :
on return, the permission item (formatted accoring to ptype, see
-"permissions" for more detail
out_detail :
on return, the permission detail (at this time, always NULL)
Returns :

-TRUE if a permission was returned, FALSE if idx was invalid

 

-

-

-
nm_setting_connection_permissions_user_allowed ()

-
gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);

-

-Checks whether the given username is allowed to view/access this connection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingConnection
-
uname :
the user name to check permissions for
Returns :

-TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connection

-

-

-

-
nm_setting_connection_add_permission ()

-
gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);

-

-Adds a permission to the connection's permission list.  At this time, only
-the "user" permission type is supported, and pitem must be a username. See
-"permissions": for more details.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingConnection
-
ptype :
the permission type; at this time only "user" is supported
pitem :
the permission item formatted as required for ptype
-
detail :
unused at this time; must be NULL. [allow-none]
-
Returns :
TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype or pitem was invalid or it the permission was already
-present in the list

-

-

-

-
nm_setting_connection_remove_permission ()

-
void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);

-

-Removes the permission at index idx from the connection.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingConnection
-
idx :
the zero-based index of the permission to remove

-

-

-

+

 
Property Details

-

+

 
The "autoconnect" property

 
  "autoconnect"              gboolean              : Read / Write / Construct

 

@@ -628,7 +442,7 @@ intervention to activate the connection.  Defaults to 
+

 
The "id" property

 
  "id"                       gchar*                : Read / Write

 

@@ -638,29 +452,7 @@ A human readable unique idenfier for the connection, like "Work WiFi" or
 
Default value: NULL

 

 

-

-
The "permissions" property

-
  "permissions"              GSList_gchararray_*   : Read / Write

-

-An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
-this connection.  Otherwise a user is allowed to access this connection
-if and only if they are in this list. Each entry is of the form
-"[type]:[id]:[reserved]", for example:
-

-

-   user:dcbw:blah
-

-

-At this time only the 'user' [type] is allowed.  Any other values are
-ignored and reserved for future use.  [id] is the username that this
-permission refers to, which may not contain the ':' character. Any
-[reserved] information present must be ignored and is reserved for
-future use.  All of [type], [id], and [reserved] must be valid UTF-8.
-

-

-

-

+

 
The "read-only" property

 
  "read-only"                gboolean              : Read / Write / Construct

 

@@ -671,7 +463,7 @@ if the connection is read-only and cannot be modified.
 
Default value: FALSE

 

 

-

+

 
The "timestamp" property

 
  "timestamp"                guint64               : Read / Write / Construct

 

@@ -681,7 +473,7 @@ _successfully_ fully activated.
 
Default value: 0

 

 

-

+

 
The "type" property

 
  "type"                     gchar*                : Read / Write

 

@@ -693,7 +485,7 @@ type's parameters.  For example, for WiFi devices, the name of the
 
Default value: NULL

 

 

-

+

 
The "uuid" property

 
  "uuid"                     gchar*                : Read / Write

 

@@ -717,6 +509,6 @@ be generated by 
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 4a2d7925..47af8253 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,24 +39,29 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_GSM_SETTING_NAME
-enum                NMSettingGsmError;
+
#define             NM_SETTING_GSM_SETTING_NAME
+enum                NMSettingGsmError;
 #define             NM_TYPE_SETTING_GSM_ERROR
 #define             NM_SETTING_GSM_ERROR
 GQuark              nm_setting_gsm_error_quark          (void);
 #define             NM_SETTING_GSM_NUMBER
 #define             NM_SETTING_GSM_USERNAME
 #define             NM_SETTING_GSM_PASSWORD
-#define             NM_SETTING_GSM_PASSWORD_FLAGS
 #define             NM_SETTING_GSM_APN
 #define             NM_SETTING_GSM_NETWORK_ID
 #define             NM_SETTING_GSM_NETWORK_TYPE
 #define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_PIN
-#define             NM_SETTING_GSM_PIN_FLAGS
 #define             NM_SETTING_GSM_HOME_ONLY
+#define             NM_SETTING_GSM_PUK
+#define             NM_SETTING_GSM_BAND
+#define             NM_GSM_NETWORK_ANY
+#define             NM_GSM_NETWORK_UMTS_HSPA
+#define             NM_GSM_NETWORK_GPRS_EDGE
+#define             NM_GSM_NETWORK_PREFER_UMTS_HSPA
+#define             NM_GSM_NETWORK_PREFER_GPRS_EDGE
 enum                NMSettingGsmNetworkType;
 enum                NMSettingGsmNetworkBand;
                     NMSettingGsm;
@@ -72,46 +77,42 @@ const char *        guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
 gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
-NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);
-NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_puk              (NMSettingGsm *setting);
+int                 nm_setting_gsm_get_band             (NMSettingGsm *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingGsmError
-

 
   GObject
    +----NMSetting
          +----NMSettingGsm
 

 

-

+

 
Properties

 
   "allowed-bands"            guint                 : Read / Write / Construct
   "apn"                      gchar*                : Read / Write
+  "band"                     gint                  : Read / Write / Construct
   "home-only"                gboolean              : Read / Write
   "network-id"               gchar*                : Read / Write
   "network-type"             gint                  : Read / Write / Construct
   "number"                   gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
   "pin"                      gchar*                : Read / Write
-  "pin-flags"                guint                 : Read / Write
+  "puk"                      gchar*                : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_GSM_SETTING_NAME

 
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

@@ -119,7 +120,7 @@ const char *        
+

 
enum NMSettingGsmError

 
typedef enum
 {
@@ -133,7 +134,7 @@ const char *        
+

 
NM_TYPE_SETTING_GSM_ERROR

 
#define NM_TYPE_SETTING_GSM_ERROR (nm_setting_gsm_error_get_type ()) 
 

@@ -141,7 +142,7 @@ const char *        
+

 
NM_SETTING_GSM_ERROR

 
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 

@@ -149,102 +150,150 @@ const char *        
+

 
nm_setting_gsm_error_quark ()

 
GQuark              nm_setting_gsm_error_quark          (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER         "number"
+
#define NM_SETTING_GSM_NUMBER        "number"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_USERNAME

-
#define NM_SETTING_GSM_USERNAME       "username"
+
#define NM_SETTING_GSM_USERNAME      "username"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_PASSWORD

-
#define NM_SETTING_GSM_PASSWORD       "password"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD_FLAGS

-
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
+
#define NM_SETTING_GSM_PASSWORD      "password"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_APN

-
#define NM_SETTING_GSM_APN            "apn"
+
#define NM_SETTING_GSM_APN           "apn"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_NETWORK_ID

-
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
+
#define NM_SETTING_GSM_NETWORK_ID    "network-id"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_NETWORK_TYPE

-
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
+
#define NM_SETTING_GSM_NETWORK_TYPE  "network-type"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_ALLOWED_BANDS

-
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
+
#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_PIN

-
#define NM_SETTING_GSM_PIN            "pin"
+
#define NM_SETTING_GSM_PIN           "pin"
 

 

 

 

 

-

-
NM_SETTING_GSM_PIN_FLAGS

-
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
+

+
NM_SETTING_GSM_HOME_ONLY

+
#define NM_SETTING_GSM_HOME_ONLY     "home-only"
 

 

 

 

 

-

-
NM_SETTING_GSM_HOME_ONLY

-
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
+

+
NM_SETTING_GSM_PUK

+
#define NM_SETTING_GSM_PUK           "puk"
+

+

+

+

+

+

+
NM_SETTING_GSM_BAND

+
#define NM_SETTING_GSM_BAND          "band"
+

+

+

+

+

+

+
NM_GSM_NETWORK_ANY

+
#define NM_GSM_NETWORK_ANY              NM_SETTING_GSM_NETWORK_TYPE_ANY
 

 

 

 

 

-

+

+
NM_GSM_NETWORK_UMTS_HSPA

+
#define NM_GSM_NETWORK_UMTS_HSPA        NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
+

+

+

+

+

+

+
NM_GSM_NETWORK_GPRS_EDGE

+
#define NM_GSM_NETWORK_GPRS_EDGE        NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
+

+

+

+

+

+

+
NM_GSM_NETWORK_PREFER_UMTS_HSPA

+
#define NM_GSM_NETWORK_PREFER_UMTS_HSPA NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
+

+

+

+

+

+

+
NM_GSM_NETWORK_PREFER_GPRS_EDGE

+
#define NM_GSM_NETWORK_PREFER_GPRS_EDGE NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
+

+

+

+

+

+

 
enum NMSettingGsmNetworkType

 
typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
@@ -258,7 +307,7 @@ const char *        
+

 
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -281,14 +330,14 @@ const char *        
+

 
NMSettingGsm

 
typedef struct _NMSettingGsm NMSettingGsm;

 

 

 

 

-

+

 
NMSettingGsmClass

 
typedef struct {
 	NMSettingClass parent;
@@ -304,126 +353,281 @@ const char *        
+

 
nm_setting_gsm_get_type ()

 
GType               nm_setting_gsm_get_type             (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_gsm_new ()

 
NMSetting *         nm_setting_gsm_new                  (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_gsm_get_number ()

 
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_username ()

 
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_password ()

 
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_apn ()

 
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_network_id ()

 
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_network_type ()

 
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_allowed_bands ()

 
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_pin ()

 
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_gsm_get_home_only ()

 
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

-
nm_setting_gsm_get_pin_flags ()

-
NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);

+

+
nm_setting_gsm_get_puk ()

+
const char *        nm_setting_gsm_get_puk              (NMSettingGsm *setting);

+

+

 

-
-

 
 
 

 
setting :
the NMSettingGsm
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the "pin"
+
 
 

 
 

 

 

-

-
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);

+

+
nm_setting_gsm_get_band ()

+
int                 nm_setting_gsm_get_band             (NMSettingGsm *setting);

+

+

 

-
-

 
 
 

 
setting :
the NMSettingGsm
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
+
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "allowed-bands" property

 
  "allowed-bands"            guint                 : Read / Write / Construct

 

@@ -434,7 +638,7 @@ frequency band control.
 
Default value: 1

 

 

-

+

 
The "apn" property

 
  "apn"                      gchar*                : Read / Write

 

@@ -449,7 +653,17 @@ GSM 03.60 Section 14.9.
 
Default value: NULL

 

 

-

+

+
The "band" property

+
  "band"                     gint                  : Read / Write / Construct

+

+DEPRECATED
+

+
Allowed values: [-1,5]

+
Default value: -1

+

+

+

 
The "home-only" property

 
  "home-only"                gboolean              : Read / Write

 

@@ -459,7 +673,7 @@ Connections to roaming networks will not be made.
 
Default value: FALSE

 

 

-

+

 
The "network-id" property

 
  "network-id"               gchar*                : Read / Write

 

@@ -472,7 +686,7 @@ roaming control of the device is not otherwise possible.
 
Default value: NULL

 

 

-

+

 
The "network-type" property

 
  "network-type"             gint                  : Read / Write / Construct

 

@@ -481,11 +695,11 @@ technologies.  The permitted values are: -1: any, 0: 3G only,
 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all
 devices allow network preference control.
 

-
Allowed values: [G_MAXULONG,3]

+
Allowed values: [-1,3]

 
Default value: -1

 

 

-

+

 
The "number" property

 
  "number"                   gchar*                : Read / Write

 

@@ -497,7 +711,7 @@ automatically when required.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -508,17 +722,7 @@ password is required, it is specified here.
 
Default value: NULL

 

 

-

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "pin" property

 
  "pin"                      gchar*                : Read / Write

 

@@ -529,17 +733,16 @@ the device.
 
Default value: NULL

 

 

-

-
The "pin-flags" property

-
  "pin-flags"                guint                 : Read / Write

+

+
The "puk" property

+
  "puk"                      gchar*                : Read / Write

 

-Flags indicating how to handle "pin":.
+DEPRECATED
 

-
Allowed values: <= 7

-
Default value: 0

+
Default value: NULL

 

 

-

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -553,6 +756,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 6a701adf..d4b1422f 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
-enum                NMSettingIP4ConfigError;
+
#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
+enum                NMSettingIP4ConfigError;
 #define             NM_TYPE_SETTING_IP4_CONFIG_ERROR
 #define             NM_SETTING_IP4_CONFIG_ERROR
 GQuark              nm_setting_ip4_config_error_quark   (void);
@@ -63,42 +63,40 @@ enum                NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
 #define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-typedef             NMIP4Address;
-GType               nm_ip4_address_get_type             (void);
-NMIP4Address *      nm_ip4_address_new                  (void);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
-void                nm_ip4_address_unref                (NMIP4Address *address);
-gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);
-guint32             nm_ip4_address_get_address          (NMIP4Address *address);
-void                nm_ip4_address_set_address          (NMIP4Address *address,
+typedef             NMIP4Address;
+NMIP4Address *      nm_ip4_address_new                  (void);
+NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
+void                nm_ip4_address_ref                  (NMIP4Address *address);
+void                nm_ip4_address_unref                (NMIP4Address *address);
+gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);
+guint32             nm_ip4_address_get_address          (NMIP4Address *address);
+void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
+void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
-void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
+void                nm_ip4_address_set_gateway          (NMIP4Address *address,
                                                          guint32 gateway);
-typedef             NMIP4Route;
-GType               nm_ip4_route_get_type               (void);
-NMIP4Route *        nm_ip4_route_new                    (void);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
-gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);
-guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
-void                nm_ip4_route_set_dest               (NMIP4Route *route,
+typedef             NMIP4Route;
+NMIP4Route *        nm_ip4_route_new                    (void);
+NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);
+void                nm_ip4_route_ref                    (NMIP4Route *route);
+void                nm_ip4_route_unref                  (NMIP4Route *route);
+gboolean            nm_ip4_route_compare                (NMIP4Route *route,
+                                                         NMIP4Route *other);
+guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
+void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
+void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
+void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
                                                          guint32 next_hop);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
-void                nm_ip4_route_set_metric             (NMIP4Route *route,
+guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
+void                nm_ip4_route_set_metric             (NMIP4Route *route,
                                                          guint32 metric);
                     NMSettingIP4Config;
                     NMSettingIP4ConfigClass;
@@ -128,10 +126,10 @@ const char *        NMSettingIP4Config *setting);
 guint32             nm_setting_ip4_config_get_num_addresses
                                                         (NMSettingIP4Config *setting);
-NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
+                                                         NMIP4Address *address);
 void                nm_setting_ip4_config_remove_address
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);
@@ -139,10 +137,10 @@ const char *        NMSettingIP4Config *setting);
 guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
+                                                         NMIP4Route *route);
 void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);
 void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
@@ -161,27 +159,15 @@ const char *        gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP4ConfigError
-

-
-  GBoxed
-   +----NMIP4Address
-

-
-  GBoxed
-   +----NMIP4Route
-

 
   GObject
    +----NMSetting
          +----NMSettingIP4Config
 

 

-

+

 
Properties

 
   "addresses"                GPtrArray_GArray_guint__*  : Read / Write
@@ -198,14 +184,14 @@ const char *        routes"                   GPtrArray_GArray_guint__*  : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_IP4_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

@@ -213,7 +199,7 @@ const char *        
+

 
enum NMSettingIP4ConfigError

 
typedef enum
 {
@@ -227,7 +213,7 @@ const char *        
+

 
NM_TYPE_SETTING_IP4_CONFIG_ERROR

 
#define NM_TYPE_SETTING_IP4_CONFIG_ERROR (nm_setting_ip4_config_error_get_type ()) 
 

@@ -235,7 +221,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ERROR

 
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 

@@ -243,14 +229,22 @@ const char *        
+

 
nm_setting_ip4_config_error_quark ()

 
GQuark              nm_setting_ip4_config_error_quark   (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_IP4_CONFIG_METHOD

 
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

@@ -258,7 +252,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DNS

 
#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 

@@ -266,7 +260,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 

@@ -274,7 +268,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ADDRESSES

 
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

@@ -282,7 +276,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ROUTES

 
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

@@ -290,7 +284,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

@@ -298,7 +292,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -306,7 +300,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

 
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

@@ -314,7 +308,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

@@ -322,7 +316,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

@@ -330,7 +324,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

@@ -338,7 +332,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

@@ -346,7 +340,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_AUTO

 
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 

@@ -354,7 +348,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -362,7 +356,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

 
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
 

@@ -370,7 +364,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 

@@ -378,7 +372,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

 
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 

@@ -386,7 +380,7 @@ const char *        
+

 
NMIP4Address

 
typedef struct NMIP4Address NMIP4Address;
 

@@ -394,95 +388,237 @@ const char *        
-
nm_ip4_address_get_type ()

-
GType               nm_ip4_address_get_type             (void);

-

-

-

-

-

+

 
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

+
NMIP4Address *      nm_ip4_address_new                  (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_ip4_address_dup ()

-
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

+
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

 

 

+

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


source :

+
Returns :

+

 

 

-

+

 
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

+
void                nm_ip4_address_ref                  (NMIP4Address *address);

 

 

+

++
+
+
+
+


address :

+

 

 

-

+

 
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

+
void                nm_ip4_address_unref                (NMIP4Address *address);

 

 

+

++
+
+
+
+


address :

+

 

 

-

+

 
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

+
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);

 

 

+

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


address :

+
other :

+
Returns :

+

 

 

-

+

 
nm_ip4_address_get_address ()

-
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

+
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip4_address_set_address ()

-
void                nm_ip4_address_set_address          (NMIP4Address *address,
+
void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);

 

 

+

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


address :

+
addr :

+

 

 

-

+

 
nm_ip4_address_get_prefix ()

-
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

+
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip4_address_set_prefix ()

-
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);

 

 

+

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


address :

+
prefix :

+

 

 

-

+

 
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

+
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip4_address_set_gateway ()

-
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
                                                          guint32 gateway);

 

 

+

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


address :

+
gateway :

+

 

 

-

+

 
NMIP4Route

 
typedef struct NMIP4Route NMIP4Route;
 

@@ -490,117 +626,289 @@ const char *        
-
nm_ip4_route_get_type ()

-
GType               nm_ip4_route_get_type               (void);

-

-

-

-

-

+

 
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

+
NMIP4Route *        nm_ip4_route_new                    (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_ip4_route_dup ()

-
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);

+
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

+
void                nm_ip4_route_ref                    (NMIP4Route *route);

 

 

+

++
+
+
+
+


route :

+

 

 

-

+

 
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

+
void                nm_ip4_route_unref                  (NMIP4Route *route);

 

 

+

++
+
+
+
+


route :

+

 

 

-

+

 
nm_ip4_route_compare ()

-
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);

+
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
+                                                         NMIP4Route *other);

 

 

+

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


route :

+
other :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

+
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
+
void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);

 

 

+

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


route :

+
dest :

+

 

 

-

+

 
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

+
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);

 

 

+

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


route :

+
prefix :

+

 

 

-

+

 
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

+
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_set_next_hop ()

-
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
                                                          guint32 next_hop);

 

 

+

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


route :

+
next_hop :

+

 

 

-

+

 
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

+
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip4_route_set_metric ()

-
void                nm_ip4_route_set_metric             (NMIP4Route *route,
+
void                nm_ip4_route_set_metric             (NMIP4Route *route,
                                                          guint32 metric);

 

 

+

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


route :

+
metric :

+

 

 

-

+

 
NMSettingIP4Config

 
typedef struct _NMSettingIP4Config NMSettingIP4Config;

 

 

 

 

-

+

 
NMSettingIP4ConfigClass

 
typedef struct {
 	NMSettingClass parent;
@@ -616,246 +924,694 @@ const char *        
+

 
nm_setting_ip4_config_get_type ()

 
GType               nm_setting_ip4_config_get_type      (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ip4_config_new ()

 
NMSetting *         nm_setting_ip4_config_new           (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_method ()

 
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_num_dns ()

 
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_dns ()

 
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_add_dns ()

 
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
                                                          guint32 dns);

 

 

+

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


setting :

+
dns :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_remove_dns ()

 
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip4_config_clear_dns ()

 
void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip4_config_get_num_dns_searches ()

 
guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_dns_search ()

 
const char *        nm_setting_ip4_config_get_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_add_dns_search ()

 
gboolean            nm_setting_ip4_config_add_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          const char *dns_search);

 

 

+

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


setting :

+
dns_search :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_remove_dns_search ()

 
void                nm_setting_ip4_config_remove_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip4_config_clear_dns_searches ()

 
void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip4_config_get_num_addresses ()

 
guint32             nm_setting_ip4_config_get_num_addresses
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_add_address ()

 
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

+                                                         NMIP4Address *address);

 

 

+

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


setting :

+
address :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_remove_address ()

 
void                nm_setting_ip4_config_remove_address
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip4_config_clear_addresses ()

 
void                nm_setting_ip4_config_clear_addresses
                                                         (NMSettingIP4Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip4_config_get_num_routes ()

 
guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_add_route ()

 
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

+                                                         NMIP4Route *route);

 

 

+

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


setting :

+
route :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_remove_route ()

 
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip4_config_clear_routes ()

 
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip4_config_get_ignore_auto_routes ()

 
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_ignore_auto_dns ()

 
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_client_id ()

 
const char *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_send_hostname ()

 
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_hostname ()

 
const char *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_never_default ()

 
gboolean            nm_setting_ip4_config_get_never_default
                                                         (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip4_config_get_may_fail ()

 
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

 
  "addresses"                GPtrArray_GArray_guint__*  : Read / Write

 

@@ -870,7 +1626,7 @@ either automatic or disabled with these methods.
 

 

 

-

+

 
The "dhcp-client-id" property

 
  "dhcp-client-id"           gchar*                : Read / Write

 

@@ -880,7 +1636,7 @@ DHCP server may use to cusomize the DHCP lease and options.
 
Default value: NULL

 

 

-

+

 
The "dhcp-hostname" property

 
  "dhcp-hostname"            gchar*                : Read / Write

 

@@ -890,7 +1646,7 @@ specified name will be sent to the DHCP server when acquiring a lease.
 
Default value: NULL

 

 

-

+

 
The "dhcp-send-hostname" property

 
  "dhcp-send-hostname"       gboolean              : Read / Write / Construct

 

@@ -903,7 +1659,7 @@ the current persistent hostname of the computer is sent.
 
Default value: TRUE

 

 

-

+

 
The "dns" property

 
  "dns"                      GArray_guint_*        : Read / Write

 

@@ -916,7 +1672,7 @@ connection.
 

 

 

-

+

 
The "dns-search" property

 
  "dns-search"               GSList_gchararray_*   : Read / Write

 

@@ -928,7 +1684,7 @@ are used as the only search domains for this connection.
 

 

 

-

+

 
The "ignore-auto-dns" property

 
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

 

@@ -940,7 +1696,7 @@ and search domains specified in 
+

 
The "ignore-auto-routes" property

 
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

 

@@ -951,7 +1707,7 @@ configured routes are ignored and only routes specified in
 
Default value: FALSE

 

 

-

+

 
The "may-fail" property

 
  "may-fail"                 gboolean              : Read / Write / Construct

 

@@ -965,7 +1721,7 @@ but IPv6 configuration completes successfully.
 
Default value: FALSE

 

 

-

+

 
The "method" property

 
  "method"                   gchar*                : Read / Write

 

@@ -985,7 +1741,7 @@ This property must be set.
 
Default value: NULL

 

 

-

+

 
The "never-default" property

 
  "never-default"            gboolean              : Read / Write / Construct

 

@@ -995,7 +1751,7 @@ meaning it will never be assigned the default route by NetworkManager.
 
Default value: FALSE

 

 

-

+

 
The "routes" property

 
  "routes"                   GPtrArray_GArray_guint__*  : Read / Write

 

@@ -1013,6 +1769,6 @@ or 'disabled' methods because there is no upstream network.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 060c80fe..6946c47d 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
-enum                NMSettingIP6ConfigError;
+
#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
+enum                NMSettingIP6ConfigError;
 #define             NM_TYPE_SETTING_IP6_CONFIG_ERROR
 #define             NM_SETTING_IP6_CONFIG_ERROR
 GQuark              nm_setting_ip6_config_error_quark   (void);
@@ -61,49 +61,46 @@ enum                NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-typedef             NMIP6Address;
-GType               nm_ip6_address_get_type             (void);
-NMIP6Address *          nm_ip6_address_new              (void);
-NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
-void                nm_ip6_address_unref                (NMIP6Address *address);
-gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);
-const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
-void                nm_ip6_address_set_address          (NMIP6Address *address,
+typedef             NMIP6Address;
+NMIP6Address *      nm_ip6_address_new                  (void);
+NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
+void                nm_ip6_address_ref                  (NMIP6Address *address);
+void                nm_ip6_address_unref                (NMIP6Address *address);
+gboolean            nm_ip6_address_compare              (NMIP6Address *address,
+                                                         NMIP6Address *other);
+const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
+void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
+void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
-void                nm_ip6_address_set_gateway          (NMIP6Address *address,
+const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
+void                nm_ip6_address_set_gateway          (NMIP6Address *address,
                                                          const struct in6_addr *gw);
-typedef             NMIP6Route;
-GType               nm_ip6_route_get_type               (void);
-NMIP6Route *            nm_ip6_route_new                (void);
-NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *route);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
-gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);
-const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
-void                nm_ip6_route_set_dest               (NMIP6Route *route,
+typedef             NMIP6Route;
+NMIP6Route *        nm_ip6_route_new                    (void);
+NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *route);
+void                nm_ip6_route_ref                    (NMIP6Route *route);
+void                nm_ip6_route_unref                  (NMIP6Route *route);
+gboolean            nm_ip6_route_compare                (NMIP6Route *route,
+                                                         NMIP6Route *other);
+const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
+void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
+void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
+void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
                                                          const struct in6_addr *next_hop);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
-void                nm_ip6_route_set_metric             (NMIP6Route *route,
+guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
+void                nm_ip6_route_set_metric             (NMIP6Route *route,
                                                          guint32 metric);
                     NMSettingIP6Config;
                     NMSettingIP6ConfigClass;
 GType               nm_setting_ip6_config_get_type      (void);
-NMSetting *             nm_setting_ip6_config_new       (void);
-const char *            nm_setting_ip6_config_get_method
-                                                        (NMSettingIP6Config *setting);
+NMSetting *         nm_setting_ip6_config_new           (void);
+const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
 const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);
@@ -114,7 +111,7 @@ const struct in6_addr * void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);
-const char *            nm_setting_ip6_config_get_dns_search
+const char *        nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_dns_search
@@ -127,11 +124,10 @@ const char *            NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);
-NMIP6Address *          nm_setting_ip6_config_get_address
-                                                        (NMSettingIP6Config *setting,
+NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
+                                                         NMIP6Address *address);
 void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
@@ -139,10 +135,10 @@ const char *            NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);
-NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
+NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
+                                                         NMIP6Route *route);
 void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);
 void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
@@ -155,27 +151,15 @@ const char *            gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP6ConfigError
-

-
-  GBoxed
-   +----NMIP6Address
-

-
-  GBoxed
-   +----NMIP6Route
-

 
   GObject
    +----NMSetting
          +----NMSettingIP6Config
 

 

-

+

 
Properties

 
   "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write
@@ -189,14 +173,14 @@ const char *            routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_IP6_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

@@ -204,7 +188,7 @@ const char *            
+

 
enum NMSettingIP6ConfigError

 
typedef enum
 {
@@ -218,7 +202,7 @@ const char *            
+

 
NM_TYPE_SETTING_IP6_CONFIG_ERROR

 
#define NM_TYPE_SETTING_IP6_CONFIG_ERROR (nm_setting_ip6_config_error_get_type ()) 
 

@@ -226,7 +210,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_ERROR

 
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 

@@ -234,14 +218,22 @@ const char *            
+

 
nm_setting_ip6_config_error_quark ()

 
GQuark              nm_setting_ip6_config_error_quark   (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_IP6_CONFIG_METHOD

 
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

@@ -249,7 +241,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_DNS

 
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 

@@ -257,7 +249,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 

@@ -265,7 +257,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_ADDRESSES

 
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

@@ -273,7 +265,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_ROUTES

 
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 

@@ -281,7 +273,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

@@ -289,7 +281,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -297,7 +289,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

@@ -305,7 +297,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 

@@ -313,7 +305,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

 
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 

@@ -321,7 +313,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_AUTO

 
#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
 

@@ -329,7 +321,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_DHCP

 
#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
 

@@ -337,7 +329,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -345,7 +337,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_MANUAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
 

@@ -353,7 +345,7 @@ const char *            
+

 
NM_SETTING_IP6_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
 

@@ -361,7 +353,7 @@ const char *            
+

 
NMIP6Address

 
typedef struct NMIP6Address NMIP6Address;
 

@@ -369,95 +361,237 @@ const char *            
-
nm_ip6_address_get_type ()

-
GType               nm_ip6_address_get_type             (void);

-

-

-

-

-

+

 
nm_ip6_address_new ()

-
NMIP6Address *          nm_ip6_address_new              (void);

+
NMIP6Address *      nm_ip6_address_new                  (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_ip6_address_dup ()

-
NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);

+
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

 

 

+

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


source :

+
Returns :

+

 

 

-

+

 
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

+
void                nm_ip6_address_ref                  (NMIP6Address *address);

 

 

+

++
+
+
+
+


address :

+

 

 

-

+

 
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

+
void                nm_ip6_address_unref                (NMIP6Address *address);

 

 

+

++
+
+
+
+


address :

+

 

 

-

+

 
nm_ip6_address_compare ()

-
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);

+
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
+                                                         NMIP6Address *other);

 

 

+

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


address :

+
other :

+
Returns :

+

 

 

-

+

 
nm_ip6_address_get_address ()

-
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

+
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
+
void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);

 

 

+

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


address :

+
addr :

+

 

 

-

+

 
nm_ip6_address_get_prefix ()

-
guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);

+
guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);

 

 

+

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


address :

+
prefix :

+

 

 

-

+

 
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

+
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

 

 

+

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


address :

+
Returns :

+

 

 

-

+

 
nm_ip6_address_set_gateway ()

-
void                nm_ip6_address_set_gateway          (NMIP6Address *address,
+
void                nm_ip6_address_set_gateway          (NMIP6Address *address,
                                                          const struct in6_addr *gw);

 

 

+

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


address :

+
gw :

+

 

 

-

+

 
NMIP6Route

 
typedef struct NMIP6Route NMIP6Route;
 

@@ -465,117 +599,289 @@ const char *            
-
nm_ip6_route_get_type ()

-
GType               nm_ip6_route_get_type               (void);

-

-

-

-

-

+

 
nm_ip6_route_new ()

-
NMIP6Route *            nm_ip6_route_new                (void);

+
NMIP6Route *        nm_ip6_route_new                    (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_ip6_route_dup ()

-
NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *route);

+
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

+
void                nm_ip6_route_ref                    (NMIP6Route *route);

 

 

+

++
+
+
+
+


route :

+

 

 

-

+

 
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

+
void                nm_ip6_route_unref                  (NMIP6Route *route);

 

 

+

++
+
+
+
+


route :

+

 

 

-

+

 
nm_ip6_route_compare ()

-
gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);

+
gboolean            nm_ip6_route_compare                (NMIP6Route *route,
+                                                         NMIP6Route *other);

 

 

+

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


route :

+
other :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

+
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
+
void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);

 

 

+

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


route :

+
dest :

+

 

 

-

+

 
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

+
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);

 

 

+

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


route :

+
prefix :

+

 

 

-

+

 
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

+
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
                                                          const struct in6_addr *next_hop);

 

 

+

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


route :

+
next_hop :

+

 

 

-

+

 
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

+
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

 

 

+

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


route :

+
Returns :

+

 

 

-

+

 
nm_ip6_route_set_metric ()

-
void                nm_ip6_route_set_metric             (NMIP6Route *route,
+
void                nm_ip6_route_set_metric             (NMIP6Route *route,
                                                          guint32 metric);

 

 

+

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


route :

+
metric :

+

 

 

-

+

 
NMSettingIP6Config

 
typedef struct _NMSettingIP6Config NMSettingIP6Config;

 

 

 

 

-

+

 
NMSettingIP6ConfigClass

 
typedef struct {
 	NMSettingClass parent;
@@ -591,224 +897,625 @@ const char *            
+

 
nm_setting_ip6_config_get_type ()

 
GType               nm_setting_ip6_config_get_type      (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ip6_config_new ()

-
NMSetting *             nm_setting_ip6_config_new       (void);

+
NMSetting *         nm_setting_ip6_config_new           (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_method ()

-
const char *            nm_setting_ip6_config_get_method
-                                                        (NMSettingIP6Config *setting);

+
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_num_dns ()

 
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_dns ()

 
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_add_dns ()

 
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
                                                          const struct in6_addr *dns);

 

 

+

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


setting :

+
dns :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_remove_dns ()

 
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip6_config_clear_dns ()

 
void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip6_config_get_num_dns_searches ()

 
guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_dns_search ()

-
const char *            nm_setting_ip6_config_get_dns_search
+
const char *        nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_add_dns_search ()

 
gboolean            nm_setting_ip6_config_add_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          const char *dns_search);

 

 

+

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


setting :

+
dns_search :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_remove_dns_search ()

 
void                nm_setting_ip6_config_remove_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip6_config_clear_dns_searches ()

 
void                nm_setting_ip6_config_clear_dns_searches
                                                         (NMSettingIP6Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip6_config_get_num_addresses ()

 
guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_address ()

-
NMIP6Address *          nm_setting_ip6_config_get_address
-                                                        (NMSettingIP6Config *setting,
+
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_add_address ()

 
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

+                                                         NMIP6Address *address);

 

 

+

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


setting :

+
address :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_remove_address ()

 
void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip6_config_clear_addresses ()

 
void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip6_config_get_num_routes ()

 
guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_route ()

-
NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
+
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_add_route ()

 
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

+                                                         NMIP6Route *route);

 

 

+

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


setting :

+
route :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_remove_route ()

 
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_ip6_config_clear_routes ()

 
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_ip6_config_get_ignore_auto_routes ()

 
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_ignore_auto_dns ()

 
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_never_default ()

 
gboolean            nm_setting_ip6_config_get_never_default
                                                         (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ip6_config_get_may_fail ()

 
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

 
  "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write

 

@@ -825,7 +1532,7 @@ assigned an address with these methods.
 

 

 

-

+

 
The "dns" property

 
  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write

 

@@ -839,7 +1546,7 @@ this connection.
 

 

 

-

+

 
The "dns-search" property

 
  "dns-search"               GSList_gchararray_*   : Read / Write

 

@@ -851,7 +1558,7 @@ as the only search domains for this connection.
 

 

 

-

+

 
The "ignore-auto-dns" property

 
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

 

@@ -864,7 +1571,7 @@ used.
 
Default value: FALSE

 

 

-

+

 
The "ignore-auto-routes" property

 
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

 

@@ -875,7 +1582,7 @@ specified in 
+

 
The "may-fail" property

 
  "may-fail"                 gboolean              : Read / Write / Construct

 

@@ -889,7 +1596,7 @@ but IPv4 configuration completes successfully.
 
Default value: FALSE

 

 

-

+

 
The "method" property

 
  "method"                   gchar*                : Read / Write

 

@@ -907,7 +1614,7 @@ method are not yet supported.
 
Default value: NULL

 

 

-

+

 
The "never-default" property

 
  "never-default"            gboolean              : Read / Write / Construct

 

@@ -917,7 +1624,7 @@ meaning it will never be assigned the default IPv6 route by NetworkManager.
 
Default value: FALSE

 

 

-

+

 
The "routes" property

 
  "routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write

 

@@ -935,6 +1642,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 43ea8d27..d77036ac 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-enum                NMSettingOlpcMeshError;
+
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
+enum                NMSettingOlpcMeshError;
 #define             NM_TYPE_SETTING_OLPC_MESH_ERROR
 #define             NM_SETTING_OLPC_MESH_ERROR
 GQuark              nm_setting_olpc_mesh_error_quark    (void);
@@ -59,19 +59,15 @@ const NMSettingOlpcMesh *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingOlpcMeshError
-

 
   GObject
    +----NMSetting
          +----NMSettingOlpcMesh
 

 

-

+

 
Properties

 
   "channel"                  guint                 : Read / Write / Construct
@@ -79,14 +75,14 @@ const ssid"                     GArray_guchar_*       : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_OLPC_MESH_SETTING_NAME

 
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

@@ -94,7 +90,7 @@ const 
+

 
enum NMSettingOlpcMeshError

 
typedef enum
 {
@@ -107,7 +103,7 @@ const 
+

 
NM_TYPE_SETTING_OLPC_MESH_ERROR

 
#define NM_TYPE_SETTING_OLPC_MESH_ERROR (nm_setting_olpc_mesh_error_get_type ()) 
 

@@ -115,7 +111,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_ERROR

 
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 

@@ -123,14 +119,22 @@ const 
+

 
nm_setting_olpc_mesh_error_quark ()

 
GQuark              nm_setting_olpc_mesh_error_quark    (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_OLPC_MESH_SSID

 
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

@@ -138,7 +142,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_CHANNEL

 
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

@@ -146,7 +150,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

 
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

@@ -154,14 +158,14 @@ const 
+

 
NMSettingOlpcMesh

 
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

 

 

 

 

-

+

 
NMSettingOlpcMeshClass

 
typedef struct {
 	NMSettingClass parent;
@@ -177,14 +181,22 @@ const 
+

 
nm_setting_olpc_mesh_get_type ()

 
GType               nm_setting_olpc_mesh_get_type       (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_olpc_mesh_new ()

 
NMSetting *         nm_setting_olpc_mesh_new            (void);

 

@@ -194,36 +206,82 @@ Creates a new 
 
 
Returns :

-the new empty NMSettingOlpcMesh object
+ the new empty NMSettingOlpcMesh object
+
 
 

 

 

-

+

 
nm_setting_olpc_mesh_get_ssid ()

 
const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_olpc_mesh_get_channel ()

 
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

 
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (NMSettingOlpcMesh *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "channel" property

 
  "channel"                  guint                 : Read / Write / Construct

 

@@ -232,7 +290,7 @@ Channel on which the mesh network to join is located.
 
Default value: 0

 

 

-

+

 
The "dhcp-anycast-address" property

 
  "dhcp-anycast-address"     GArray_guchar_*       : Read / Write

 

@@ -242,7 +300,7 @@ the request.
 

 

 

-

+

 
The "ssid" property

 
  "ssid"                     GArray_guchar_*       : Read / Write

 

@@ -253,6 +311,6 @@ SSID of the mesh network to join.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index eade54a5..6488a3f0 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_PPP_SETTING_NAME
-enum                NMSettingPPPError;
+
#define             NM_SETTING_PPP_SETTING_NAME
+enum                NMSettingPPPError;
 #define             NM_TYPE_SETTING_PPP_ERROR
 #define             NM_SETTING_PPP_ERROR
 GQuark              nm_setting_ppp_error_quark          (void);
@@ -89,19 +89,15 @@ enum                N
                                                         (NMSettingPPP *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPError
-

 
   GObject
    +----NMSetting
          +----NMSettingPPP
 

 

-

+

 
Properties

 
   "baud"                     guint                 : Read / Write / Construct
@@ -124,14 +120,14 @@ enum                N
   "require-mppe-128"         gboolean              : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_PPP_SETTING_NAME

 
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

@@ -139,7 +135,7 @@ enum                N
 

 

 

-

+

 
enum NMSettingPPPError

 
typedef enum
 {
@@ -153,7 +149,7 @@ enum                N
 

 

 

-

+

 
NM_TYPE_SETTING_PPP_ERROR

 
#define NM_TYPE_SETTING_PPP_ERROR (nm_setting_ppp_error_get_type ()) 
 

@@ -161,7 +157,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_ERROR

 
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 

@@ -169,14 +165,22 @@ enum                N
 

 

 

-

+

 
nm_setting_ppp_error_quark ()

 
GQuark              nm_setting_ppp_error_quark          (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_PPP_NOAUTH

 
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

@@ -184,7 +188,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REFUSE_EAP

 
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

@@ -192,7 +196,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REFUSE_PAP

 
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

@@ -200,7 +204,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REFUSE_CHAP

 
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

@@ -208,7 +212,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REFUSE_MSCHAP

 
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

@@ -216,7 +220,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REFUSE_MSCHAPV2

 
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

@@ -224,7 +228,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_NOBSDCOMP

 
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

@@ -232,7 +236,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_NODEFLATE

 
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

@@ -240,7 +244,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_NO_VJ_COMP

 
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

@@ -248,7 +252,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REQUIRE_MPPE

 
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

@@ -256,7 +260,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_REQUIRE_MPPE_128

 
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

@@ -264,7 +268,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_MPPE_STATEFUL

 
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

@@ -272,7 +276,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_CRTSCTS

 
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

@@ -280,7 +284,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_BAUD

 
#define NM_SETTING_PPP_BAUD              "baud"
 

@@ -288,7 +292,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_MRU

 
#define NM_SETTING_PPP_MRU               "mru"
 

@@ -296,7 +300,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_MTU

 
#define NM_SETTING_PPP_MTU               "mtu"
 

@@ -304,7 +308,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_LCP_ECHO_FAILURE

 
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

@@ -312,7 +316,7 @@ enum                N
 

 

 

-

+

 
NM_SETTING_PPP_LCP_ECHO_INTERVAL

 
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

@@ -320,14 +324,14 @@ enum                N
 

 

 

-

+

 
NMSettingPPP

 
typedef struct _NMSettingPPP NMSettingPPP;

 

 

 

 

-

+

 
NMSettingPPPClass

 
typedef struct {
 	NMSettingClass parent;
@@ -343,150 +347,436 @@ enum                N
 

 

 

-

+

 
nm_setting_ppp_get_type ()

 
GType               nm_setting_ppp_get_type             (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ppp_new ()

 
NMSetting *         nm_setting_ppp_new                  (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_ppp_get_noauth ()

 
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_refuse_eap ()

 
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_refuse_pap ()

 
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_refuse_chap ()

 
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_refuse_mschap ()

 
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_refuse_mschapv2 ()

 
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_nobsdcomp ()

 
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_nodeflate ()

 
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_no_vj_comp ()

 
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_require_mppe ()

 
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_require_mppe_128 ()

 
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_mppe_stateful ()

 
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_crtscts ()

 
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_baud ()

 
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_mru ()

 
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_mtu ()

 
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_lcp_echo_failure ()

 
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_ppp_get_lcp_echo_interval ()

 
guint32             nm_setting_ppp_get_lcp_echo_interval
                                                         (NMSettingPPP *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "baud" property

 
  "baud"                     guint                 : Read / Write / Construct

 

@@ -497,7 +787,7 @@ choose the speed.
 
Default value: 0

 

 

-

+

 
The "crtscts" property

 
  "crtscts"                  gboolean              : Read / Write / Construct

 

@@ -508,7 +798,7 @@ set to FALSE.
 
Default value: FALSE

 

 

-

+

 
The "lcp-echo-failure" property

 
  "lcp-echo-failure"         guint                 : Read / Write / Construct

 

@@ -520,7 +810,7 @@ value if this property is used.
 
Default value: 0

 

 

-

+

 
The "lcp-echo-interval" property

 
  "lcp-echo-interval"        guint                 : Read / Write / Construct

 

@@ -532,7 +822,7 @@ possible to autodetect this.
 
Default value: 0

 

 

-

+

 
The "mppe-stateful" property

 
  "mppe-stateful"            gboolean              : Read / Write / Construct

 

@@ -542,7 +832,7 @@ information on stateful MPPE.",
 
Default value: FALSE

 

 

-

+

 
The "mru" property

 
  "mru"                      guint                 : Read / Write / Construct

 

@@ -554,7 +844,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 
Default value: 0

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -564,7 +854,7 @@ size.
 
Default value: 0

 

 

-

+

 
The "no-vj-comp" property

 
  "no-vj-comp"               gboolean              : Read / Write / Construct

 

@@ -573,7 +863,7 @@ If TRUE, Van Jacobsen TCP header compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "noauth" property

 
  "noauth"                   gboolean              : Read / Write / Construct

 

@@ -584,7 +874,7 @@ the remote side.  In almost all cases, this should be TRUE.
 
Default value: TRUE

 

 

-

+

 
The "nobsdcomp" property

 
  "nobsdcomp"                gboolean              : Read / Write / Construct

 

@@ -593,7 +883,7 @@ If TRUE, BSD compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "nodeflate" property

 
  "nodeflate"                gboolean              : Read / Write / Construct

 

@@ -602,7 +892,7 @@ If TRUE, 'deflate' compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "refuse-chap" property

 
  "refuse-chap"              gboolean              : Read / Write / Construct

 

@@ -611,7 +901,7 @@ If TRUE, the CHAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-eap" property

 
  "refuse-eap"               gboolean              : Read / Write / Construct

 

@@ -620,7 +910,7 @@ If TRUE, the EAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-mschap" property

 
  "refuse-mschap"            gboolean              : Read / Write / Construct

 

@@ -629,7 +919,7 @@ If TRUE, the MSCHAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-mschapv2" property

 
  "refuse-mschapv2"          gboolean              : Read / Write / Construct

 

@@ -638,7 +928,7 @@ If TRUE, the MSCHAPv2 authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-pap" property

 
  "refuse-pap"               gboolean              : Read / Write / Construct

 

@@ -647,7 +937,7 @@ If TRUE, the PAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "require-mppe" property

 
  "require-mppe"             gboolean              : Read / Write / Construct

 

@@ -659,7 +949,7 @@ connections.
 
Default value: FALSE

 

 

-

+

 
The "require-mppe-128" property

 
  "require-mppe-128"         gboolean              : Read / Write / Construct

 

@@ -673,6 +963,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 87669254..46c551bb 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,17 +39,16 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_PPPOE_SETTING_NAME
-enum                NMSettingPPPOEError;
+
#define             NM_SETTING_PPPOE_SETTING_NAME
+enum                NMSettingPPPOEError;
 #define             NM_TYPE_SETTING_PPPOE_ERROR
 #define             NM_SETTING_PPPOE_ERROR
 GQuark              nm_setting_pppoe_error_quark        (void);
 #define             NM_SETTING_PPPOE_SERVICE
 #define             NM_SETTING_PPPOE_USERNAME
 #define             NM_SETTING_PPPOE_PASSWORD
-#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
                     NMSettingPPPOE;
                     NMSettingPPPOEClass;
 GType               nm_setting_pppoe_get_type           (void);
@@ -57,39 +56,32 @@ enum                char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
-NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPOEError
-

 
   GObject
    +----NMSetting
          +----NMSettingPPPOE
 

 

-

+

 
Properties

 
   "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
   "service"                  gchar*                : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_PPPOE_SETTING_NAME

 
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

@@ -97,7 +89,7 @@ const char *        
+

 
enum NMSettingPPPOEError

 
typedef enum
 {
@@ -111,7 +103,7 @@ const char *        
+

 
NM_TYPE_SETTING_PPPOE_ERROR

 
#define NM_TYPE_SETTING_PPPOE_ERROR (nm_setting_pppoe_error_get_type ()) 
 

@@ -119,7 +111,7 @@ const char *        
+

 
NM_SETTING_PPPOE_ERROR

 
#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 

@@ -127,53 +119,53 @@ const char *        
+

 
nm_setting_pppoe_error_quark ()

 
GQuark              nm_setting_pppoe_error_quark        (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_PPPOE_SERVICE

-
#define NM_SETTING_PPPOE_SERVICE        "service"
+
#define NM_SETTING_PPPOE_SERVICE  "service"
 

 

 

 

 

-

+

 
NM_SETTING_PPPOE_USERNAME

-
#define NM_SETTING_PPPOE_USERNAME       "username"
+
#define NM_SETTING_PPPOE_USERNAME "username"
 

 

 

 

 

-

+

 
NM_SETTING_PPPOE_PASSWORD

-
#define NM_SETTING_PPPOE_PASSWORD       "password"
+
#define NM_SETTING_PPPOE_PASSWORD "password"
 

 

 

 

 

-

-
NM_SETTING_PPPOE_PASSWORD_FLAGS

-
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
-

-

-

-

-

-

+

 
NMSettingPPPOE

 
typedef struct _NMSettingPPPOE NMSettingPPPOE;

 

 

 

 

-

+

 
NMSettingPPPOEClass

 
typedef struct {
 	NMSettingClass parent;
@@ -189,65 +181,105 @@ const char *        
+

 
nm_setting_pppoe_get_type ()

 
GType               nm_setting_pppoe_get_type           (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_pppoe_new ()

 
NMSetting *         nm_setting_pppoe_new                (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_pppoe_get_service ()

 
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_pppoe_get_username ()

 
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_pppoe_get_password ()

 
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

 

 

-

-

-

-
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);

 

-
-

 
 
 

 
setting :
the NMSettingPPPOE
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
+
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -256,17 +288,7 @@ Password used to authenticate with the PPPoE service.
 
Default value: NULL

 

 

-

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "service" property

 
  "service"                  gchar*                : Read / Write

 

@@ -278,7 +300,7 @@ access concentrators or a specific service is known to be required.
 
Default value: NULL

 

 

-

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -290,6 +312,6 @@ Username used to authenticate with the PPPoE service.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 5e5483ec..9d8082bd 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_SERIAL_SETTING_NAME
-enum                NMSettingSerialError;
+
#define             NM_SETTING_SERIAL_SETTING_NAME
+enum                NMSettingSerialError;
 #define             NM_TYPE_SETTING_SERIAL_ERROR
 #define             NM_SETTING_SERIAL_ERROR
 GQuark              nm_setting_serial_error_quark       (void);
@@ -62,19 +62,15 @@ enum                guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingSerialError
-

 
   GObject
    +----NMSetting
          +----NMSettingSerial
 

 

-

+

 
Properties

 
   "baud"                     guint                 : Read / Write / Construct
@@ -84,14 +80,14 @@ enum                stopbits"                 guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_SERIAL_SETTING_NAME

 
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

@@ -99,7 +95,7 @@ enum                
+

 
enum NMSettingSerialError

 
typedef enum
 {
@@ -113,7 +109,7 @@ enum                
+

 
NM_TYPE_SETTING_SERIAL_ERROR

 
#define NM_TYPE_SETTING_SERIAL_ERROR (nm_setting_serial_error_get_type ()) 
 

@@ -121,7 +117,7 @@ enum                
+

 
NM_SETTING_SERIAL_ERROR

 
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 

@@ -129,14 +125,22 @@ enum                
+

 
nm_setting_serial_error_quark ()

 
GQuark              nm_setting_serial_error_quark       (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -144,7 +148,7 @@ enum                
+

 
NM_SETTING_SERIAL_BITS

 
#define NM_SETTING_SERIAL_BITS "bits"
 

@@ -152,7 +156,7 @@ enum                
+

 
NM_SETTING_SERIAL_PARITY

 
#define NM_SETTING_SERIAL_PARITY "parity"
 

@@ -160,7 +164,7 @@ enum                
+

 
NM_SETTING_SERIAL_STOPBITS

 
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

@@ -168,7 +172,7 @@ enum                
+

 
NM_SETTING_SERIAL_SEND_DELAY

 
#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 

@@ -176,14 +180,14 @@ enum                
+

 
NMSettingSerial

 
typedef struct _NMSettingSerial NMSettingSerial;

 

 

 

 

-

+

 
NMSettingSerialClass

 
typedef struct {
 	NMSettingClass parent;
@@ -199,58 +203,149 @@ enum                
+

 
nm_setting_serial_get_type ()

 
GType               nm_setting_serial_get_type          (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_serial_new ()

 
NMSetting *         nm_setting_serial_new               (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_serial_get_baud ()

 
guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_serial_get_bits ()

 
guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_serial_get_parity ()

 
char                nm_setting_serial_get_parity        (NMSettingSerial *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_serial_get_stopbits ()

 
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_serial_get_send_delay ()

 
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "baud" property

 
  "baud"                     guint                 : Read / Write / Construct

 

@@ -261,7 +356,7 @@ ignore speed settings and use the highest available speed.
 
Default value: 57600

 

 

-

+

 
The "bits" property

 
  "bits"                     guint                 : Read / Write / Construct

 

@@ -271,7 +366,7 @@ Byte-width of the serial communication.
 
Default value: 8

 

 

-

+

 
The "parity" property

 
  "parity"                   gchar                 : Read / Write / Construct

 

@@ -282,7 +377,7 @@ odd parity, or 'n' for no parity.
 
Default value: 110

 

 

-

+

 
The "send-delay" property

 
  "send-delay"               guint64               : Read / Write / Construct

 

@@ -291,7 +386,7 @@ Time to delay between each byte sent to the modem, in microseconds.
 
Default value: 0

 

 

-

+

 
The "stopbits" property

 
  "stopbits"                 guint                 : Read / Write / Construct

 

@@ -305,6 +400,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index e8cd2fb9..311f1008 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_VPN_SETTING_NAME
-enum                NMSettingVpnError;
+
#define             NM_SETTING_VPN_SETTING_NAME
+enum                NMSettingVpnError;
 #define             NM_TYPE_SETTING_VPN_ERROR
 #define             NM_SETTING_VPN_ERROR
 GQuark              nm_setting_vpn_error_quark          (void);
@@ -52,7 +52,7 @@ enum                N
 #define             NM_SETTING_VPN_SECRETS
                     NMSettingVPN;
                     NMSettingVPNClass;
-void                (*NMVPNIterFunc)                    (const char *key,
+void                (*VPNIterFunc)                      (const char *key,
                                                          const char *value,
                                                          gpointer user_data);
 GType               nm_setting_vpn_get_type             (void);
@@ -67,7 +67,7 @@ const char *        void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
                                                          const char *key);
 void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
+                                                         VPNIterFunc func,
                                                          gpointer user_data);
 void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
                                                          const char *key,
@@ -77,23 +77,19 @@ const char *        void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);
 void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
+                                                         VPNIterFunc func,
                                                          gpointer user_data);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingVpnError
-

 
   GObject
    +----NMSetting
          +----NMSettingVPN
 

 

-

+

 
Properties

 
   "data"                     GHashTable_gchararray+gchararray_*  : Read / Write
@@ -102,14 +98,14 @@ const char *        user-name"                gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_VPN_SETTING_NAME

 
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

@@ -117,7 +113,7 @@ const char *        
+

 
enum NMSettingVpnError

 
typedef enum
 {
@@ -130,7 +126,7 @@ const char *        
+

 
NM_TYPE_SETTING_VPN_ERROR

 
#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ()) 
 

@@ -138,7 +134,7 @@ const char *        
+

 
NM_SETTING_VPN_ERROR

 
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 

@@ -146,14 +142,22 @@ const char *        
+

 
nm_setting_vpn_error_quark ()

 
GQuark              nm_setting_vpn_error_quark          (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_VPN_SERVICE_TYPE

 
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

@@ -161,7 +165,7 @@ const char *        
+

 
NM_SETTING_VPN_USER_NAME

 
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

@@ -169,7 +173,7 @@ const char *        
+

 
NM_SETTING_VPN_DATA

 
#define NM_SETTING_VPN_DATA         "data"
 

@@ -177,7 +181,7 @@ const char *        
+

 
NM_SETTING_VPN_SECRETS

 
#define NM_SETTING_VPN_SECRETS      "secrets"
 

@@ -185,14 +189,14 @@ const char *        
+

 
NMSettingVPN

 
typedef struct _NMSettingVPN NMSettingVPN;

 

 

 

 

-

+

 
NMSettingVPNClass

 
typedef struct {
 	NMSettingClass parent;
@@ -208,156 +212,330 @@ const char *        
-
NMVPNIterFunc ()

-
void                (*NMVPNIterFunc)                    (const char *key,
+

+
VPNIterFunc ()

+
void                (*VPNIterFunc)                      (const char *key,
                                                          const char *value,
                                                          gpointer user_data);

 

 

+

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


key :

+
value :

+
user_data :

+

 

 

-

+

 
nm_setting_vpn_get_type ()

 
GType               nm_setting_vpn_get_type             (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_vpn_new ()

 
NMSetting *         nm_setting_vpn_new                  (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_vpn_get_service_type ()

 
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_vpn_get_user_name ()

 
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_vpn_add_data_item ()

 
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *item);

 

 

+

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


setting :

+
key :

+
item :

+

 

 

-

+

 
nm_setting_vpn_get_data_item ()

 
const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
                                                          const char *key);

 

 

+

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


setting :

+
key :

+
Returns :

+

 

 

-

+

 
nm_setting_vpn_remove_data_item ()

 
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
                                                          const char *key);

 

 

+

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


setting :

+
key :

+

 

 

-

+

 
nm_setting_vpn_foreach_data_item ()

 
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
+                                                         VPNIterFunc func,
                                                          gpointer user_data);

 

-Iterates all data items stored in this setting
 

 

-
-
-

 
 
 

 
setting :
a NMSettingVPN
+
 
 

 

 
func :
an user provided function. [scope call]
+
 
 

 

 
user_data :
data to be passed to func
+
 
 

 
 

 

 

-

+

 
nm_setting_vpn_add_secret ()

 
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *secret);

 

 

+

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


setting :

+
key :

+
secret :

+

 

 

-

+

 
nm_setting_vpn_get_secret ()

 
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);

 

 

+

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


setting :

+
key :

+
Returns :

+

 

 

-

+

 
nm_setting_vpn_remove_secret ()

 
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);

 

 

+

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


setting :

+
key :

+

 

 

-

+

 
nm_setting_vpn_foreach_secret ()

 
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
+                                                         VPNIterFunc func,
                                                          gpointer user_data);

 

-Iterates all secrets stored in this setting.
 

 

-
-
-

 
 
 

 
setting :
a NMSettingVPN
+
 
 

 

 
func :
an user provided function. [scope call]
+
 
 

 

 
user_data :
data to be passed to func
+
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "data" property

 
  "data"                     GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -366,7 +544,7 @@ and values must be strings.
 

 

 

-

+

 
The "secrets" property

 
  "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -375,7 +553,7 @@ passwords or private keys.  Both keys and values must be strings.
 

 

 

-

+

 
The "service-type" property

 
  "service-type"             gchar*                : Read / Write

 

@@ -386,7 +564,7 @@ plugin.
 
Default value: NULL

 

 

-

+

 
The "user-name" property

 
  "user-name"                gchar*                : Read / Write

 
User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.

@@ -396,6 +574,6 @@ plugin.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 0b707566..19b43451 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRED_SETTING_NAME
-enum                NMSettingWiredError;
+
#define             NM_SETTING_WIRED_SETTING_NAME
+enum                NMSettingWiredError;
 #define             NM_TYPE_SETTING_WIRED_ERROR
 #define             NM_SETTING_WIRED_ERROR
 GQuark              nm_setting_wired_error_quark        (void);
@@ -87,19 +87,15 @@ const char *        const char *key);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWiredError
-

 
   GObject
    +----NMSetting
          +----NMSettingWired
 

 

-

+

 
Properties

 
   "auto-negotiate"           gboolean              : Read / Write / Construct
@@ -114,14 +110,14 @@ const char *        speed"                    guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRED_SETTING_NAME

 
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

@@ -129,7 +125,7 @@ const char *        
+

 
enum NMSettingWiredError

 
typedef enum
 {
@@ -142,7 +138,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRED_ERROR

 
#define NM_TYPE_SETTING_WIRED_ERROR (nm_setting_wired_error_get_type ()) 
 

@@ -150,7 +146,7 @@ const char *        
+

 
NM_SETTING_WIRED_ERROR

 
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 

@@ -158,14 +154,22 @@ const char *        
+

 
nm_setting_wired_error_quark ()

 
GQuark              nm_setting_wired_error_quark        (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_WIRED_PORT

 
#define NM_SETTING_WIRED_PORT "port"
 

@@ -173,7 +177,7 @@ const char *        
+

 
NM_SETTING_WIRED_SPEED

 
#define NM_SETTING_WIRED_SPEED "speed"
 

@@ -181,7 +185,7 @@ const char *        
+

 
NM_SETTING_WIRED_DUPLEX

 
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

@@ -189,7 +193,7 @@ const char *        
+

 
NM_SETTING_WIRED_AUTO_NEGOTIATE

 
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

@@ -197,7 +201,7 @@ const char *        
+

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

@@ -205,7 +209,7 @@ const char *        
+

 
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

@@ -213,7 +217,7 @@ const char *        
+

 
NM_SETTING_WIRED_MTU

 
#define NM_SETTING_WIRED_MTU "mtu"
 

@@ -221,7 +225,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_SUBCHANNELS

 
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 

@@ -229,7 +233,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_NETTYPE

 
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

@@ -237,7 +241,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_OPTIONS

 
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

@@ -245,14 +249,14 @@ const char *        
+

 
NMSettingWired

 
typedef struct _NMSettingWired NMSettingWired;

 

 

 

 

-

+

 
NMSettingWiredClass

 
typedef struct {
 	NMSettingClass parent;
@@ -268,71 +272,192 @@ const char *        
+

 
nm_setting_wired_get_type ()

 
GType               nm_setting_wired_get_type           (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wired_new ()

 
NMSetting *         nm_setting_wired_new                (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wired_get_port ()

 
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_speed ()

 
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_duplex ()

 
const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_auto_negotiate ()

 
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_mac_address ()

 
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_cloned_mac_address ()

 
const GByteArray *  nm_setting_wired_get_cloned_mac_address
                                                         (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_mtu ()

 
guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_get_s390_subchannels ()

 
const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);

@@ -351,19 +476,20 @@ conjunction with that device.
 
 
 
Returns :

-a GPtrArray of strings, each specifying one subchannel the
-s390 device uses to communicate to the host.
+ a GPtrArray of strings, each specifying one subchannel the
+s390 device uses to communicate to the host.
+
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_nettype ()

 
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

 

 Returns the s390 device type this connection should apply to.  Will be one
-of 'qeth', 'lcs', or 'ctcm'.
+of 'qeth', 'lcs', or 'ctc'.
 

 
@@ -375,13 +501,14 @@ of 'qeth', 'lcs', or 'ctcm'.
 
-
+

 

 

 
Returns :
the s390 device type the s390 device type
+
 

 
 

 

 

-

+

 
nm_setting_wired_get_num_s390_options ()

 
guint32             nm_setting_wired_get_num_s390_options
                                                         (NMSettingWired *setting);

@@ -400,13 +527,14 @@ option individually using Returns :

-the number of s390-specific device options
+ the number of s390-specific device options
+
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_option ()

 
gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
                                                          guint32 idx,
@@ -430,30 +558,33 @@ such as during option iteration.
 
 
idx :

 index of the desired option, from 0 to
-nm_setting_wired_get_num_s390_options() - 1
+nm_setting_wired_get_num_s390_options() - 1
+
 
 
 
out_key :

 on return, the key name of the s390 specific option; this value is
-owned by the setting and should not be modified
+owned by the setting and should not be modified
+
 
 
 
out_value :

 on return, the value of the key of the s390 specific option; this
-value is owned by the setting and should not be modified
+value is owned by the setting and should not be modified
+
 
 
 
Returns :

-
-TRUE on success if the index was valid and an option was found,
+ TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
-currently held by the setting)
+currently held by the setting)
+
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_option_by_key ()

 
const char *        nm_setting_wired_get_s390_option_by_key
                                                         (NMSettingWired *setting,
@@ -472,44 +603,91 @@ Returns the value associated with the s390-specific option specified by
 
 
 
key :

-the key for which to retrieve the value
+the key for which to retrieve the value
+
 
 
 
Returns :

-the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified
+ the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified
+
 
 
 

 

 

-

+

 
nm_setting_wired_add_s390_option ()

 
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
                                                          const char *key,
                                                          const char *item);

 

 

+

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


setting :

+
key :

+
item :

+
Returns :

+

 

 

-

+

 
nm_setting_wired_remove_s390_option ()

 
gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                                          const char *key);

 

 

+

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


setting :

+
key :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "auto-negotiate" property

 
  "auto-negotiate"           gboolean              : Read / Write / Construct

 
If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.

 
Default value: TRUE

 

 

-

+

 
The "cloned-mac-address" property

 
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

 

@@ -518,7 +696,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

-

+

 
The "duplex" property

 
  "duplex"                   gchar*                : Read / Write

 

@@ -528,7 +706,7 @@ Either 'half' or 'full'.
 
Default value: NULL

 

 

-

+

 
The "mac-address" property

 
  "mac-address"              GArray_guchar_*       : Read / Write

 

@@ -538,7 +716,7 @@ of the device (i.e. MAC spoofing).
 

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -548,7 +726,7 @@ breaking larger packets up into multiple Ethernet frames.
 
Default value: 0

 

 

-

+

 
The "port" property

 
  "port"                     gchar*                : Read / Write

 

@@ -560,7 +738,7 @@ If the device supports only one port type, this setting is ignored.
 
Default value: NULL

 

 

-

+

 
The "s390-nettype" property

 
  "s390-nettype"             gchar*                : Read / Write

 

@@ -570,7 +748,7 @@ the different types of virtual network devices available on s390 systems.
 
Default value: NULL

 

 

-

+

 
The "s390-options" property

 
  "s390-options"             GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -581,7 +759,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

 

-

+

 
The "s390-subchannels" property

 
  "s390-subchannels"         GPtrArray_gchararray_*  : Read / Write

 

@@ -594,7 +772,7 @@ composed of hexadecimal characters and the period (.) character.
 

 

 

-

+

 
The "speed" property

 
  "speed"                    guint                 : Read / Write / Construct

 

@@ -607,6 +785,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 21d51d29..34d1341b 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRELESS_SETTING_NAME
-enum                NMSettingWirelessError;
+
#define             NM_SETTING_WIRELESS_SETTING_NAME
+enum                NMSettingWirelessError;
 #define             NM_TYPE_SETTING_WIRELESS_ERROR
 #define             NM_SETTING_WIRELESS_ERROR
 GQuark              nm_setting_wireless_error_quark     (void);
@@ -58,8 +58,6 @@ enum                NM_SETTING_WIRELESS_MTU
 #define             NM_SETTING_WIRELESS_SEEN_BSSIDS
 #define             NM_SETTING_WIRELESS_SEC
-#define             NM_SETTING_WIRELESS_MODE_ADHOC
-#define             NM_SETTING_WIRELESS_MODE_INFRA
                     NMSettingWireless;
                     NMSettingWirelessClass;
 GType               nm_setting_wireless_get_type        (void);
@@ -85,25 +83,21 @@ const char *        gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
+                                                         guint32 ap_flags,
+                                                         guint32 ap_wpa,
+                                                         guint32 ap_rsn,
+                                                         guint32 ap_mode);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessError
-

 
   GObject
    +----NMSetting
          +----NMSettingWireless
 

 

-

+

 
Properties

 
   "band"                     gchar*                : Read / Write
@@ -120,14 +114,14 @@ const char *        tx-power"                 guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRELESS_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

@@ -135,7 +129,7 @@ const char *        
+

 
enum NMSettingWirelessError

 
typedef enum
 {
@@ -150,7 +144,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRELESS_ERROR

 
#define NM_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
 

@@ -158,7 +152,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_ERROR

 
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 

@@ -166,14 +160,22 @@ const char *        
+

 
nm_setting_wireless_error_quark ()

 
GQuark              nm_setting_wireless_error_quark     (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
NM_SETTING_WIRELESS_SSID

 
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

@@ -181,7 +183,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MODE

 
#define NM_SETTING_WIRELESS_MODE        "mode"
 

@@ -189,7 +191,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_BAND

 
#define NM_SETTING_WIRELESS_BAND        "band"
 

@@ -197,7 +199,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_CHANNEL

 
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

@@ -205,7 +207,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_BSSID

 
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

@@ -213,7 +215,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_RATE

 
#define NM_SETTING_WIRELESS_RATE        "rate"
 

@@ -221,7 +223,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_TX_POWER

 
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

@@ -229,7 +231,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

@@ -237,7 +239,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

@@ -245,7 +247,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MTU

 
#define NM_SETTING_WIRELESS_MTU         "mtu"
 

@@ -253,7 +255,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SEEN_BSSIDS

 
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

@@ -261,7 +263,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SEC

 
#define NM_SETTING_WIRELESS_SEC         "security"
 

@@ -269,30 +271,14 @@ const char *        
-
NM_SETTING_WIRELESS_MODE_ADHOC

-
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_MODE_INFRA

-
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
-

-

-

-

-

-

+

 
NMSettingWireless

 
typedef struct _NMSettingWireless NMSettingWireless;

 

 

 

 

-

+

 
NMSettingWirelessClass

 
typedef struct {
 	NMSettingClass parent;
@@ -308,138 +294,414 @@ const char *        
+

 
nm_setting_wireless_get_type ()

 
GType               nm_setting_wireless_get_type        (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wireless_new ()

 
NMSetting *         nm_setting_wireless_new             (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wireless_get_ssid ()

 
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_mode ()

 
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_band ()

 
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_channel ()

 
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_bssid ()

 
const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_rate ()

 
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_tx_power ()

 
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_mac_address ()

 
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_cloned_mac_address ()

 
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
                                                         (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_mtu ()

 
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_security ()

 
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_add_seen_bssid ()

 
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
                                                          const char *bssid);

 

 

+

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


setting :

+
bssid :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_num_seen_bssids ()

 
guint32             nm_setting_wireless_get_num_seen_bssids
                                                         (NMSettingWireless *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_get_seen_bssid ()

 
const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_ap_security_compatible ()

 
gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);

-

-

+                                                         guint32 ap_flags,
+                                                         guint32 ap_wpa,
+                                                         guint32 ap_rsn,
+                                                         guint32 ap_mode);

+

+

+

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


s_wireless :

+
s_wireless_sec :

+
ap_flags :

+
ap_wpa :

+
ap_rsn :

+
ap_mode :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "band" property

 
  "band"                     gchar*                : Read / Write

 

@@ -453,7 +715,7 @@ capability and may not work with all drivers.
 
Default value: NULL

 

 

-

+

 
The "bssid" property

 
  "bssid"                    GArray_guchar_*       : Read / Write

 

@@ -464,7 +726,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
 

 

 

-

+

 
The "channel" property

 
  "channel"                  guint                 : Read / Write / Construct

 

@@ -476,7 +738,7 @@ also requires the 'band' property to be set.
 
Default value: 0

 

 

-

+

 
The "cloned-mac-address" property

 
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

 

@@ -485,7 +747,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

-

+

 
The "mac-address" property

 
  "mac-address"              GArray_guchar_*       : Read / Write

 

@@ -495,7 +757,7 @@ of the device (i.e. MAC spoofing).
 

 

 

-

+

 
The "mode" property

 
  "mode"                     gchar*                : Read / Write

 

@@ -505,7 +767,7 @@ infrastructure is assumed.
 
Default value: NULL

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -515,7 +777,7 @@ breaking larger packets up into multiple Ethernet frames.
 
Default value: 0

 

 

-

+

 
The "rate" property

 
  "rate"                     guint                 : Read / Write / Construct

 

@@ -527,7 +789,7 @@ support setting a static bitrate.
 
Default value: 0

 

 

-

+

 
The "security" property

 
  "security"                 gchar*                : Read / Write

 

@@ -538,7 +800,7 @@ the connection contains a valid 802-11-wireless-security setting.
 
Default value: NULL

 

 

-

+

 
The "seen-bssids" property

 
  "seen-bssids"              GSList_gchararray_*   : Read / Write

 

@@ -552,7 +814,7 @@ find hidden APs by matching up scan results with the BSSIDs in this list.
 

 

 

-

+

 
The "ssid" property

 
  "ssid"                     GArray_guchar_*       : Read / Write

 

@@ -560,7 +822,7 @@ SSID of the WiFi network.
 

 

 

-

+

 
The "tx-power" property

 
  "tx-power"                 guint                 : Read / Write / Construct

 

@@ -574,6 +836,6 @@ devices support setting a static transmit power.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 7fdbc952..9642f812 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
-enum                NMSettingWirelessSecurityError;
+
#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
+enum                NMSettingWirelessSecurityError;
 #define             NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
 #define             NM_SETTING_WIRELESS_SECURITY_ERROR
 GQuark              nm_setting_wireless_security_error_quark
@@ -59,12 +59,9 @@ enum                NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
 #define             NM_SETTING_WIRELESS_SECURITY_PSK
-#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
                     NMSettingWirelessSecurity;
                     NMSettingWirelessSecurityClass;
 GType               nm_setting_wireless_security_get_type
@@ -113,14 +110,10 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
-                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);
@@ -132,38 +125,29 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);
 NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);
 

 

-

+

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessSecurityError
-

 
   GObject
    +----NMSetting
          +----NMSettingWirelessSecurity
 

 

-

+

 
Properties

 
   "auth-alg"                 gchar*                : Read / Write
   "group"                    GSList_gchararray_*   : Read / Write
   "key-mgmt"                 gchar*                : Read / Write
   "leap-password"            gchar*                : Read / Write
-  "leap-password-flags"      guint                 : Read / Write
   "leap-username"            gchar*                : Read / Write
   "pairwise"                 GSList_gchararray_*   : Read / Write
   "proto"                    GSList_gchararray_*   : Read / Write
   "psk"                      gchar*                : Read / Write
-  "psk-flags"                guint                 : Read / Write
-  "wep-key-flags"            guint                 : Read / Write
   "wep-key-type"             guint                 : Read / Write / Construct
   "wep-key0"                 gchar*                : Read / Write
   "wep-key1"                 gchar*                : Read / Write
@@ -172,14 +156,14 @@ const char *        wep-tx-keyidx"            guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

@@ -187,7 +171,7 @@ const char *        
+

 
enum NMSettingWirelessSecurityError

 
typedef enum
 {
@@ -204,7 +188,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR

 
#define NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR (nm_setting_wireless_security_error_get_type ()) 
 

@@ -212,7 +196,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_ERROR

 
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 

@@ -220,15 +204,23 @@ const char *        
+

 
nm_setting_wireless_security_error_quark ()

 
GQuark              nm_setting_wireless_security_error_quark
                                                         (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -242,7 +234,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

 
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

@@ -250,7 +242,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

@@ -258,7 +250,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

 
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

@@ -266,7 +258,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_PROTO

 
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

@@ -274,7 +266,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

 
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

@@ -282,7 +274,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_GROUP

 
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

@@ -290,7 +282,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 

@@ -298,7 +290,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

@@ -306,7 +298,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

@@ -314,7 +306,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

@@ -322,7 +314,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

@@ -330,23 +322,7 @@ const char *        
-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
-

-

-

-

-

-

+

 
NM_SETTING_WIRELESS_SECURITY_PSK

 
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

@@ -354,15 +330,7 @@ const char *        
-
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
-

-

-

-

-

-

+

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

@@ -370,22 +338,22 @@ const char *        
-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
+

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

 

 

 

 

-

+

 
NMSettingWirelessSecurity

 
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

 

 

 

 

-

+

 
NMSettingWirelessSecurityClass

 
typedef struct {
 	NMSettingClass parent;
@@ -401,236 +369,522 @@ const char *        
+

 
nm_setting_wireless_security_get_type ()

 
GType               nm_setting_wireless_security_get_type
                                                         (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wireless_security_new ()

 
NMSetting *         nm_setting_wireless_security_new    (void);

 

 

+

++
+
+
+
+


Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_key_mgmt ()

 
const char *        nm_setting_wireless_security_get_key_mgmt
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_num_protos ()

 
guint32             nm_setting_wireless_security_get_num_protos
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_proto ()

 
const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_add_proto ()

 
gboolean            nm_setting_wireless_security_add_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *proto);

 

 

+

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


setting :

+
proto :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_remove_proto ()

 
void                nm_setting_wireless_security_remove_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_wireless_security_clear_protos ()

 
void                nm_setting_wireless_security_clear_protos
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_wireless_security_get_num_pairwise ()

 
guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_pairwise ()

 
const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_add_pairwise ()

 
gboolean            nm_setting_wireless_security_add_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *pairwise);

 

 

+

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


setting :

+
pairwise :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_remove_pairwise ()

 
void                nm_setting_wireless_security_remove_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_wireless_security_clear_pairwise ()

 
void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_wireless_security_get_num_groups ()

 
guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_group ()

 
const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_add_group ()

 
gboolean            nm_setting_wireless_security_add_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *group);

 

 

+

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


setting :

+
group :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_remove_group ()

 
void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

+

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


setting :

+
i :

+

 

 

-

+

 
nm_setting_wireless_security_clear_groups ()

 
void                nm_setting_wireless_security_clear_groups
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

++
+
+
+
+


setting :

+

 

 

-

+

 
nm_setting_wireless_security_get_psk ()

 
const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

-

-

-
nm_setting_wireless_security_get_psk_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
-                                                        (NMSettingWirelessSecurity *setting);

 

-
-

 
 
 

 
setting :
the NMSettingWirelessSecurity
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"psk"
+
 
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_leap_username ()

 
const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_leap_password ()

 
const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

-

-

-
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);

 

-
-

 
 
 

 
setting :
the NMSettingWirelessSecurity
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"leap-password"
+
 
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_wep_key ()

 
const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);

 

 

+

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


setting :

+
idx :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_set_wep_key ()

 
void                nm_setting_wireless_security_set_wep_key
                                                         (NMSettingWirelessSecurity *setting,
@@ -638,55 +892,100 @@ const char *        const char *key);

 

 

+

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


setting :

+
idx :

+
key :

+

 

 

-

+

 
nm_setting_wireless_security_get_wep_tx_keyidx ()

 
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
nm_setting_wireless_security_get_auth_alg ()

 
const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

-

-

-
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);

 

-
-
+

 
 
 

 
setting :
the NMSettingWirelessSecurity
+
 
 

 

 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keys
+
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_wep_key_type ()

 
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

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


setting :

+
Returns :

+

 

 

-

+

 
Property Details

-

+

 
The "auth-alg" property

 
  "auth-alg"                 gchar*                : Read / Write

 

@@ -699,7 +998,7 @@ the 'leap-username' and 'leap-password' properties must be specified.
 
Default value: NULL

 

 

-

+

 
The "group" property

 
  "group"                    GSList_gchararray_*   : Read / Write

 

@@ -709,7 +1008,7 @@ one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

-

+

 
The "key-mgmt" property

 
  "key-mgmt"                 gchar*                : Read / Write

 

@@ -721,7 +1020,7 @@ any WiFi connection that uses security.
 
Default value: NULL

 

 

-

+

 
The "leap-password" property

 
  "leap-password"            gchar*                : Read / Write

 

@@ -731,17 +1030,7 @@ The login password for legacy LEAP connections (ie, key-mgmt =
 
Default value: NULL

 

 

-

-
The "leap-password-flags" property

-
  "leap-password-flags"      guint                 : Read / Write

-

-Flags indicating how to handle "leap-password".
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "leap-username" property

 
  "leap-username"            gchar*                : Read / Write

 

@@ -751,7 +1040,7 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 
Default value: NULL

 

 

-

+

 
The "pairwise" property

 
  "pairwise"                 GSList_gchararray_*   : Read / Write

 

@@ -761,7 +1050,7 @@ specified pairwise encryption capabilities.  Each element may be one of
 

 

 

-

+

 
The "proto" property

 
  "proto"                    GSList_gchararray_*   : Read / Write

 

@@ -771,7 +1060,7 @@ not specified, both WPA and RSN connections are allowed.
 

 

 

-

+

 
The "psk" property

 
  "psk"                      gchar*                : Read / Write

 

@@ -785,27 +1074,7 @@ connecting to the WiFi network.
 
Default value: NULL

 

 

-

-
The "psk-flags" property

-
  "psk-flags"                guint                 : Read / Write

-

-Flags indicating how to handle "psk"
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

-
The "wep-key-flags" property

-
  "wep-key-flags"            guint                 : Read / Write

-

-Flags indicating how to handle NMSettingWirelessSecurity WEP keys.
-

-
Allowed values: <= 7

-
Default value: 0

-

-

-

+

 
The "wep-key-type" property

 
  "wep-key-type"             guint                 : Read / Write / Construct

 

@@ -821,7 +1090,7 @@ actual WEP key.
 
Default value: 0

 

 

-

+

 
The "wep-key0" property

 
  "wep-key0"                 gchar*                : Read / Write

 

@@ -831,7 +1100,7 @@ Index 0 WEP key.  This is the WEP key used in most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key1" property

 
  "wep-key1"                 gchar*                : Read / Write

 

@@ -841,7 +1110,7 @@ Index 1 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key2" property

 
  "wep-key2"                 gchar*                : Read / Write

 

@@ -851,7 +1120,7 @@ Index 2 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key3" property

 
  "wep-key3"                 gchar*                : Read / Write

 

@@ -861,7 +1130,7 @@ Index 3 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-tx-keyidx" property

 
  "wep-tx-keyidx"            guint                 : Read / Write / Construct

 

@@ -877,6 +1146,6 @@ Linksys WRT54G) number the keys 1 - 4.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index e0a1c869..563fa60f 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -19,53 +19,18 @@
 libnm-util Reference Manual
  
 
-
-O
-                      | 
-                   A
-                      | 
-                   E
-                      | 
-                   T
-                      | 
-                   S
-                      | 
-                   T
-
+E
 
-

+

 

 Annotation Glossary

-
O

-

-out

-
Parameter for returning results. Default is transfer full.

-
A

-

-allow-none

-
NULL is ok, both for passing and for returning.

 
E

 

 element-type

 
Generics and defining elements of containers and arrays.

-
T

-

-transfer container

-
Free data container after the code is done.

-
S

-

-scope call

-
The callback is valid only during the call to the method.

-
T

-

-transfer full

-
Free data after the code is done.

-

-transfer none

-
Don't free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index b6776b7d..195b24d9 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -23,8 +23,16 @@
 
 C
                       | 
+                   D
+                      | 
+                   E
+                      | 
+                   G
+                      | 
                    I
                       | 
+                   P
+                      | 
                    S
                       | 
                    T
@@ -36,209 +44,212 @@
                    W
 
 
-

+

 

 API Index

 
C

 

-NMConnection, struct in NMConnection
+NMConnection, struct in NMConnection
 

 

 

-NMConnection::secrets-updated, object signal in NMConnection
+NMConnection::secrets-updated, object signal in NMConnection
 

 

 

-NMConnection:path, object property in NMConnection
+NMConnection:path, object property in NMConnection
 

 

 

-NMConnectionClass, struct in NMConnection
+NMConnection:scope, object property in NMConnection
 

 

 

-NMConnectionError, enum in NMConnection
+NMConnectionClass, struct in NMConnection
 

 

 

-nm_connection_add_setting, function in NMConnection
+NMConnectionError, enum in NMConnection
 

 

 

-nm_connection_clear_secrets, function in NMConnection
+NMConnectionScope, enum in NMConnection
 

 

 

-nm_connection_compare, function in NMConnection
+nm_connection_add_setting, function in NMConnection
 

 

 

-nm_connection_create_setting, function in NMConnection
+nm_connection_clear_secrets, function in NMConnection
 

 

 

-nm_connection_diff, function in NMConnection
+nm_connection_compare, function in NMConnection
 

 

 

-nm_connection_dump, function in NMConnection
+nm_connection_create_setting, function in NMConnection
 

 

 

-nm_connection_duplicate, function in NMConnection
+nm_connection_diff, function in NMConnection
 

 

 

-NM_CONNECTION_ERROR, macro in NMConnection
+nm_connection_dump, function in NMConnection
 

 

 

-nm_connection_error_quark, function in NMConnection
+nm_connection_duplicate, function in NMConnection
 

 

 

-nm_connection_for_each_setting_value, function in NMConnection
+NM_CONNECTION_ERROR, macro in NMConnection
 

 

 

-nm_connection_get_id, function in NMConnection
+nm_connection_error_quark, function in NMConnection
 

 

 

-nm_connection_get_path, function in NMConnection
+nm_connection_for_each_setting_value, function in NMConnection
 

 

 

-nm_connection_get_setting, function in NMConnection
+nm_connection_get_path, function in NMConnection
 

 

 

-nm_connection_get_setting_802_1x, function in NMConnection
+nm_connection_get_scope, function in NMConnection
 

 

 

-nm_connection_get_setting_bluetooth, function in NMConnection
+nm_connection_get_setting, function in NMConnection
 

 

 

-nm_connection_get_setting_by_name, function in NMConnection
+nm_connection_get_setting_by_name, function in NMConnection
 

 

 

-nm_connection_get_setting_cdma, function in NMConnection
+nm_connection_get_type, function in NMConnection
 

 

 

-nm_connection_get_setting_connection, function in NMConnection
+nm_connection_lookup_setting_type, function in NMConnection
 

 

 

-nm_connection_get_setting_gsm, function in NMConnection
+nm_connection_lookup_setting_type_by_quark, function in NMConnection
 

 

 

-nm_connection_get_setting_ip4_config, function in NMConnection
+nm_connection_need_secrets, function in NMConnection
 

 

 

-nm_connection_get_setting_ip6_config, function in NMConnection
+nm_connection_new, function in NMConnection
 

 

 

-nm_connection_get_setting_olpc_mesh, function in NMConnection
+nm_connection_new_from_hash, function in NMConnection
 

 

 

-nm_connection_get_setting_ppp, function in NMConnection
+NM_CONNECTION_PATH, macro in NMConnection
 

 

 

-nm_connection_get_setting_pppoe, function in NMConnection
+nm_connection_remove_setting, function in NMConnection
 

 

 

-nm_connection_get_setting_vpn, function in NMConnection
+nm_connection_replace_settings, function in NMConnection
 

 

 

-nm_connection_get_setting_wimax, function in NMConnection
+NM_CONNECTION_SCOPE, macro in NMConnection
 

 

 

-nm_connection_get_setting_wired, function in NMConnection
+nm_connection_set_path, function in NMConnection
 

 

 

-nm_connection_get_setting_wireless, function in NMConnection
+nm_connection_set_scope, function in NMConnection
 

 

 

-nm_connection_get_setting_wireless_security, function in NMConnection
+nm_connection_to_hash, function in NMConnection
 

 

 

-nm_connection_get_type, function in NMConnection
+nm_connection_update_secrets, function in NMConnection
 

 

 

-nm_connection_get_uuid, function in NMConnection
+nm_connection_verify, function in NMConnection
 

 

+
D

 

-nm_connection_lookup_setting_type, function in NMConnection
+nm_debug, macro in nm-utils
 

 

 

-nm_connection_lookup_setting_type_by_quark, function in NMConnection
+nm_debug_str, macro in nm-utils
 

 

+
E

 

-nm_connection_need_secrets, function in NMConnection
+nm_error, macro in nm-utils
 

 

 

-nm_connection_new, function in NMConnection
+nm_error_str, macro in nm-utils
 

 

+
G

 

-nm_connection_new_from_hash, function in NMConnection
+nm_get_timestamp, macro in nm-utils
 

 

 

-NM_CONNECTION_PATH, macro in NMConnection
+NM_GSM_NETWORK_ANY, macro in NMSettingGsm
 

 

 

-nm_connection_remove_setting, function in NMConnection
+NM_GSM_NETWORK_GPRS_EDGE, macro in NMSettingGsm
 

 

 

-nm_connection_replace_settings, function in NMConnection
+NM_GSM_NETWORK_PREFER_GPRS_EDGE, macro in NMSettingGsm
 

 

 

-nm_connection_set_path, function in NMConnection
+NM_GSM_NETWORK_PREFER_UMTS_HSPA, macro in NMSettingGsm
 

 

 

-nm_connection_to_hash, function in NMConnection
+NM_GSM_NETWORK_UMTS_HSPA, macro in NMSettingGsm
 

 

+
I

 

-nm_connection_update_secrets, function in NMConnection
+nm_info, macro in nm-utils
 

 

 

-nm_connection_verify, function in NMConnection
+nm_info_str, macro in nm-utils
 

 

-
I

 

-NMIP4Address, typedef in NMSettingIP4Config
+NMIP4Address, typedef in NMSettingIP4Config
 

 

 

-NMIP4Route, typedef in NMSettingIP4Config
+NMIP4Route, typedef in NMSettingIP4Config
 

 

 

@@ -262,10 +273,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-nm_ip4_address_get_type, function in NMSettingIP4Config
-

-

-

 nm_ip4_address_new, function in NMSettingIP4Config
 

 

@@ -314,10 +321,6 @@ nm_connection_verify, function in NMConnection
 
 

 

-nm_ip4_route_get_type, function in NMSettingIP4Config
-

-

-

 nm_ip4_route_new, function in NMSettingIP4Config
 

 

@@ -346,11 +349,11 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMIP6Address, typedef in NMSettingIP6Config
+NMIP6Address, typedef in NMSettingIP6Config
 

 

 

-NMIP6Route, typedef in NMSettingIP6Config
+NMIP6Route, typedef in NMSettingIP6Config
 

 

 

@@ -374,10 +377,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-nm_ip6_address_get_type, function in NMSettingIP6Config
-

-

-

 nm_ip6_address_new, function in NMSettingIP6Config
 

 

@@ -426,10 +425,6 @@ nm_connection_verify, function in NMConnection
 
 

 

-nm_ip6_route_get_type, function in NMSettingIP6Config
-

-

-

 nm_ip6_route_new, function in NMSettingIP6Config
 

 

@@ -457,6 +452,11 @@ nm_connection_verify, function in NMConnection
 nm_ip6_route_unref, function in NMSettingIP6Config
 
 

+
P

+

+nm_print_backtrace, macro in nm-utils
+

+

 
S

 

 NMSetting, struct in NMSetting
@@ -495,10 +495,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSetting8021x:password-flags, object property in NMSetting8021x
-

-

-

 NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

 

@@ -539,10 +535,6 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
-

-

-

 NMSetting8021x:private-key, object property in NMSetting8021x
 

 

@@ -551,10 +543,6 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
-

-

-

 NMSetting8021x:system-ca-certs, object property in NMSetting8021x
 

 

@@ -567,11 +555,15 @@ nm_connection_verify, function in NMConnection
 
 

 

+NMSetting8021xCKType, enum in NMSetting8021x
+

+

+

 NMSetting8021xClass, struct in NMSetting8021x
 

 

 

-NMSetting8021xError, enum in NMSetting8021x
+NMSetting8021xError, enum in NMSetting8021x
 

 

 

@@ -595,7 +587,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingBluetoothError, enum in NMSettingBluetooth
+NMSettingBluetoothError, enum in NMSettingBluetooth
 

 

 

@@ -611,10 +603,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingCdma:password-flags, object property in NMSettingCdma
-

-

-

 NMSettingCdma:username, object property in NMSettingCdma
 

 

@@ -623,7 +611,7 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSettingCdmaError, enum in NMSettingCdma
+NMSettingCdmaError, enum in NMSettingCdma
 

 

 

@@ -647,10 +635,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingConnection:permissions, object property in NMSettingConnection
-

-

-

 NMSettingConnection:read-only, object property in NMSettingConnection
 

 

@@ -671,7 +655,7 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSettingConnectionError, enum in NMSettingConnection
+NMSettingConnectionError, enum in NMSettingConnection
 

 

 

@@ -679,7 +663,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingError, enum in NMSetting
+NMSettingError, enum in NMSetting
 

 

 

@@ -695,6 +679,10 @@ nm_connection_verify, function in NMConnection
 

 

 

+NMSettingGsm:band, object property in NMSettingGsm
+

+

+

 NMSettingGsm:home-only, object property in NMSettingGsm
 

 

@@ -715,15 +703,11 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSettingGsm:password-flags, object property in NMSettingGsm
-

-

-

 NMSettingGsm:pin, object property in NMSettingGsm
 

 

 

-NMSettingGsm:pin-flags, object property in NMSettingGsm
+NMSettingGsm:puk, object property in NMSettingGsm
 

 

 

@@ -735,7 +719,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingGsmError, enum in NMSettingGsm
+NMSettingGsmError, enum in NMSettingGsm
 

 

 

@@ -747,10 +731,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingHashFlags, enum in NMSetting
-

-

-

 NMSettingIP4Config, struct in NMSettingIP4Config
 

 

@@ -807,7 +787,7 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSettingIP4ConfigError, enum in NMSettingIP4Config
+NMSettingIP4ConfigError, enum in NMSettingIP4Config
 

 

 

@@ -855,7 +835,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingIP6ConfigError, enum in NMSettingIP6Config
+NMSettingIP6ConfigError, enum in NMSettingIP6Config
 

 

 

@@ -879,7 +859,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
+NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
 

 

 

@@ -963,7 +943,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingPPPError, enum in NMSettingPPP
+NMSettingPPPError, enum in NMSettingPPP
 

 

 

@@ -975,10 +955,6 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingPPPOE:password-flags, object property in NMSettingPPPOE
-

-

-

 NMSettingPPPOE:service, object property in NMSettingPPPOE
 

 

@@ -991,11 +967,7 @@ nm_connection_verify, function in NMConnection
 
 

 

-NMSettingPPPOEError, enum in NMSettingPPPOE
-

-

-

-NMSettingSecretFlags, enum in NMSetting
+NMSettingPPPOEError, enum in NMSettingPPPOE
 

 

 

@@ -1027,7 +999,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingSerialError, enum in NMSettingSerial
+NMSettingSerialError, enum in NMSettingSerial
 

 

 

@@ -1059,27 +1031,7 @@ nm_connection_verify, function in NMConnection
 

 

 

-NMSettingVpnError, enum in NMSettingVPN
-

-

-

-NMSettingWimax, struct in NMSettingWimax
-

-

-

-NMSettingWimax:mac-address, object property in NMSettingWimax
-

-

-

-NMSettingWimax:network-name, object property in NMSettingWimax
-

-

-

-NMSettingWimaxClass, struct in NMSettingWimax
-

-

-

-NMSettingWimaxError, enum in NMSettingWimax
+NMSettingVpnError, enum in NMSettingVPN
 

 

 

@@ -1131,7 +1083,7 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NMSettingWiredError, enum in NMSettingWired
+NMSettingWiredError, enum in NMSettingWired
 

 

 

@@ -1191,7 +1143,7 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NMSettingWirelessError, enum in NMSettingWireless
+NMSettingWirelessError, enum in NMSettingWireless
 

 

 

@@ -1215,10 +1167,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
-

-

-

 NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
 

 

@@ -1235,14 +1183,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
-

-

-

-NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
-

-

-

 NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
 

 

@@ -1271,7 +1211,7 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
+NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
 

 

 

@@ -1315,6 +1255,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

+nm_setting_802_1x_get_ca_cert, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_ca_cert_blob, function in NMSetting8021x
 

 

@@ -1331,6 +1275,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+nm_setting_802_1x_get_client_cert, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_client_cert_blob, function in NMSetting8021x
 

 

@@ -1359,10 +1307,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_802_1x_get_password_flags, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 

 

@@ -1383,6 +1327,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+nm_setting_802_1x_get_phase2_ca_cert, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase2_ca_cert_blob, function in NMSetting8021x
 

 

@@ -1399,6 +1347,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+nm_setting_802_1x_get_phase2_client_cert, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase2_client_cert_blob, function in NMSetting8021x
 

 

@@ -1411,6 +1363,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+nm_setting_802_1x_get_phase2_private_key, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase2_private_key_blob, function in NMSetting8021x
 

 

@@ -1423,15 +1379,15 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_802_1x_get_phase2_private_key_password_flags, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_type, function in NMSetting8021x
 

 

 

@@ -1439,7 +1395,7 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-nm_setting_802_1x_get_pin_flags, function in NMSetting8021x
+nm_setting_802_1x_get_private_key, function in NMSetting8021x
 

 

 

@@ -1455,15 +1411,19 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-nm_setting_802_1x_get_private_key_password_flags, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_type, function in NMSetting8021x
+

+

+

+nm_setting_802_1x_get_psk, function in NMSetting8021x
 

 

 

@@ -1487,10 +1447,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NM_SETTING_802_1X_PASSWORD_FLAGS, macro in NMSetting8021x
-

-

-

 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, macro in NMSetting8021x
 

 

@@ -1531,18 +1487,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, macro in NMSetting8021x
-

-

-

 NM_SETTING_802_1X_PIN, macro in NMSetting8021x
 

 

 

-NM_SETTING_802_1X_PIN_FLAGS, macro in NMSetting8021x
-

-

-

 NM_SETTING_802_1X_PRIVATE_KEY, macro in NMSetting8021x
 

 

@@ -1551,7 +1499,7 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, macro in NMSetting8021x
+NM_SETTING_802_1X_PSK, macro in NMSetting8021x
 

 

 

@@ -1567,26 +1515,50 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

+nm_setting_802_1x_set_ca_cert_from_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_set_client_cert, function in NMSetting8021x
 

 

 

+nm_setting_802_1x_set_client_cert_from_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_set_phase2_ca_cert, function in NMSetting8021x
 

 

 

+nm_setting_802_1x_set_phase2_ca_cert_from_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_set_phase2_client_cert, function in NMSetting8021x
 

 

 

+nm_setting_802_1x_set_phase2_client_cert_from_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_set_phase2_private_key, function in NMSetting8021x
 

 

 

+nm_setting_802_1x_set_phase2_private_key_from_file, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_set_private_key, function in NMSetting8021x
 

 

 

+nm_setting_802_1x_set_private_key_from_file, function in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_SYSTEM_CA_CERTS, macro in NMSetting8021x
 

 

@@ -1651,10 +1623,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_cdma_get_password_flags, function in NMSettingCdma
-

-

-

 nm_setting_cdma_get_type, function in NMSettingCdma
 

 

@@ -1675,10 +1643,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_CDMA_PASSWORD_FLAGS, macro in NMSettingCdma
-

-

-

 NM_SETTING_CDMA_SETTING_NAME, macro in NMSettingCdma
 

 

@@ -1695,10 +1659,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_connection_add_permission, function in NMSettingConnection
-

-

-

 NM_SETTING_CONNECTION_AUTOCONNECT, macro in NMSettingConnection
 

 

@@ -1723,14 +1683,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_connection_get_num_permissions, function in NMSettingConnection
-

-

-

-nm_setting_connection_get_permission, function in NMSettingConnection
-

-

-

 nm_setting_connection_get_read_only, function in NMSettingConnection
 

 

@@ -1755,22 +1707,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_CONNECTION_PERMISSIONS, macro in NMSettingConnection
-

-

-

-nm_setting_connection_permissions_user_allowed, function in NMSettingConnection
-

-

-

 NM_SETTING_CONNECTION_READ_ONLY, macro in NMSettingConnection
 

 

 

-nm_setting_connection_remove_permission, function in NMSettingConnection
-

-

-

 NM_SETTING_CONNECTION_SETTING_NAME, macro in NMSettingConnection
 

 

@@ -1811,10 +1751,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_get_secret_flags, function in NMSetting
-

-

-

 nm_setting_get_type, function in NMSetting
 

 

@@ -1827,6 +1763,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+NM_SETTING_GSM_BAND, macro in NMSettingGsm
+

+

+

 NM_SETTING_GSM_ERROR, macro in NMSettingGsm
 

 

@@ -1843,6 +1783,10 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

+nm_setting_gsm_get_band, function in NMSettingGsm
+

+

+

 nm_setting_gsm_get_home_only, function in NMSettingGsm
 

 

@@ -1863,15 +1807,11 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-nm_setting_gsm_get_password_flags, function in NMSettingGsm
-

-

-

 nm_setting_gsm_get_pin, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_pin_flags, function in NMSettingGsm
+nm_setting_gsm_get_puk, function in NMSettingGsm
 

 

 

@@ -1907,15 +1847,11 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NM_SETTING_GSM_PASSWORD_FLAGS, macro in NMSettingGsm
-

-

-

 NM_SETTING_GSM_PIN, macro in NMSettingGsm
 

 

 

-NM_SETTING_GSM_PIN_FLAGS, macro in NMSettingGsm
+NM_SETTING_GSM_PUK, macro in NMSettingGsm
 

 

 

@@ -2391,10 +2327,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-nm_setting_pppoe_get_password_flags, function in NMSettingPPPOE
-

-

-

 nm_setting_pppoe_get_service, function in NMSettingPPPOE
 

 

@@ -2415,10 +2347,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_PPPOE_PASSWORD_FLAGS, macro in NMSettingPPPOE
-

-

-

 NM_SETTING_PPPOE_SERVICE, macro in NMSettingPPPOE
 

 

@@ -2595,10 +2523,6 @@ NMSettingWimaxError, enum in NMSettingWimax
 
 

 

-NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
-

-

-

 NM_SETTING_SERIAL_BAUD, macro in NMSettingSerial
 

 

@@ -2659,10 +2583,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_set_secret_flags, function in NMSetting
-

-

-

 nm_setting_to_hash, function in NMSetting
 

 

@@ -2755,42 +2675,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
-

-

-

-nm_setting_wimax_error_quark, function in NMSettingWimax
-

-

-

-nm_setting_wimax_get_mac_address, function in NMSettingWimax
-

-

-

-nm_setting_wimax_get_network_name, function in NMSettingWimax
-

-

-

-nm_setting_wimax_get_type, function in NMSettingWimax
-

-

-

-NM_SETTING_WIMAX_MAC_ADDRESS, macro in NMSettingWimax
-

-

-

-NM_SETTING_WIMAX_NETWORK_NAME, macro in NMSettingWimax
-

-

-

-nm_setting_wimax_new, function in NMSettingWimax
-

-

-

-NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
-

-

-

 nm_setting_wired_add_s390_option, function in NMSettingWired
 

 

@@ -3003,14 +2887,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-NM_SETTING_WIRELESS_MODE_ADHOC, macro in NMSettingWireless
-

-

-

-NM_SETTING_WIRELESS_MODE_INFRA, macro in NMSettingWireless
-

-

-

 NM_SETTING_WIRELESS_MTU, macro in NMSettingWireless
 

 

@@ -3079,10 +2955,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-nm_setting_wireless_security_get_leap_password_flags, function in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_get_leap_username, function in NMSettingWirelessSecurity
 

 

@@ -3111,10 +2983,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-nm_setting_wireless_security_get_psk_flags, function in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_get_type, function in NMSettingWirelessSecurity
 

 

@@ -3123,10 +2991,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-nm_setting_wireless_security_get_wep_key_flags, function in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_get_wep_key_type, function in NMSettingWirelessSecurity
 

 

@@ -3147,10 +3011,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, macro in NMSettingWirelessSecurity
-

-

-

 NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, macro in NMSettingWirelessSecurity
 

 

@@ -3171,10 +3031,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, macro in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_remove_group, function in NMSettingWirelessSecurity
 

 

@@ -3211,10 +3067,6 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 
 

 

-NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, macro in NMSettingWirelessSecurity
-

-

-

 NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, macro in NMSettingWirelessSecurity
 

 

@@ -3240,7 +3092,7 @@ NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
 

 
T

 

-NM_TYPE_CONNECTION_ERROR, macro in NMConnection
+NM_TYPE_CONNECTION_ERROR, macro in NMConnection
 

 

 

@@ -3296,10 +3148,6 @@ NM_TYPE_CONNECTION_ERROR, macro in NMConnection
 

 

 

-NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
-

-

-

 NM_TYPE_SETTING_WIRED_ERROR, macro in NMSettingWired
 

 

@@ -3434,17 +3282,25 @@ NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
 

 
V

 

-NMVPNIterFunc, user_function in NMSettingVPN
+VPNIterFunc, user_function in NMSettingVPN
 

 

 
W

 

+nm_warning, macro in nm-utils
+

+

+

+nm_warning_str, macro in nm-utils
+

+

+

 NMWepKeyType, enum in NMSettingWirelessSecurity
 

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 04e80a11..545175e7 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -7,8 +7,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -17,13 +17,16 @@
  
 Home
 libnm-util Reference Manual
-Next
+Next
 
-

+

 

-libnm-util API Reference

+libnm-util API Reference

 

 

+NMConnection — Describes a connection to specific network or provider
+

+

 NMSetting — Describes related configuration information
 

 

@@ -75,10 +78,9 @@
 nm-utils — Utility functions
 

 

-<xi:include></xi:include>
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 90ada1bf..69dc2827 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,18 +6,18 @@
 
 
 
-
+
 
 
 
-

+

 

 

 

 

-      for libnm-util 0.9
+      for libnm-util 0.8
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
+      http://projects.gnome.org/NetworkManager/developers/libnm-util/08/.
     

 

 

@@ -26,6 +26,9 @@
 
libnm-util API Reference

 

 

+NMConnection — Describes a connection to specific network or provider
+

+

 NMSetting — Describes related configuration information
 

 

@@ -84,6 +87,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index d9981473..ee50d977 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,7 +1,57 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
 
 
 
@@ -19,19 +69,10 @@
 
 
 
-
-
-
-
-
 
 
 
 
-
-
-
-
 
 
 
@@ -53,13 +94,10 @@
 
 
 
-
-
 
 
 
 
-
 
 
 
@@ -79,7 +117,6 @@
 
 
 
-
 
 
 
@@ -90,22 +127,15 @@
 
 
 
-
-
-
-
-
 
 
 
-
 
 
 
 
 
 
-
 
 
 
@@ -156,7 +186,6 @@
 
 
 
-
 
 
 
@@ -178,8 +207,6 @@
 
 
 
-
-
 
 
 
@@ -214,7 +241,6 @@
 
 
 
-
 
 
 
@@ -236,12 +262,9 @@
 
 
 
-
-
 
-
 
-
+
 
 
 
@@ -263,28 +286,22 @@
 
 
 
-
 
 
-
 
 
 
 
-
 
 
 
 
 
 
-
 
 
 
 
-
-
 
 
 
@@ -293,7 +310,6 @@
 
 
 
-
 
 
 
@@ -318,7 +334,6 @@
 
 
 
-
 
 
 
@@ -350,7 +365,6 @@
 
 
 
-
 
 
 
@@ -363,7 +377,6 @@
 
 
 
-
 
 
 
@@ -371,15 +384,12 @@
 
 
 
-
 
 
 
-
 
 
 
-
 
 
 
@@ -392,14 +402,19 @@
 
 
 
-
 
 
 
 
 
-
 
+
+
+
+
+
+
+
 
 
 
@@ -415,23 +430,22 @@
 
 
 
-
-
+
+
 
 
 
+
 
 
 
 
 
-
 
-
+
 
 
 
-
 
 
 
@@ -457,20 +471,12 @@
 
 
 
-
 
 
 
 
 
-
-
-
-
 
-
-
-
 
 
 
@@ -491,15 +497,12 @@
 
 
 
-
 
 
-
 
 
-
 
-
+
 
 
 
@@ -537,23 +540,35 @@
 
 
 
-
 
-
+
 
 
 
 
 
-
 
 
 
 
 
 
-
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -562,7 +577,6 @@
 
 
 
-
 
 
 
@@ -573,16 +587,11 @@
 
 
 
-
 
 
-
 
 
 
-
-
-
 
 
 
@@ -610,7 +619,6 @@
 
 
 
-
 
 
 
@@ -623,7 +631,6 @@
 
 
 
-
 
 
 
@@ -684,9 +691,6 @@
 
 
 
-
-
-
 
 
 
@@ -712,7 +716,6 @@
 
 
 
-
 
 
 
@@ -725,7 +728,6 @@
 
 
 
-
 
 
 
@@ -780,7 +782,6 @@
 
 
 
-
 
 
 
@@ -851,7 +852,6 @@
 
 
 
-
 
 
 
@@ -864,7 +864,6 @@
 
 
 
-
 
 
 
@@ -872,15 +871,12 @@
 
 
 
-
 
 
-
 
 
 
 
-
 
 
 
@@ -896,7 +892,7 @@
 
 
 
-
+
 
 
 
@@ -918,6 +914,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -948,10 +954,4 @@
 
 
 
-
-
 
-
-
-
-
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index f2650339..ccf9ab5e 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -26,7 +26,7 @@
                   Description
 
 
-

+

 

 

 
@@ -35,11 +35,29 @@
 
 
 

-

+

 
Synopsis

 
 #include <nm-utils.h>
 
+#define             nm_print_backtrace
+#define             nm_get_timestamp                    (timestamp)
+#define             nm_info                             (fmt,
+                                                         args...)
+#define             nm_info_str                         (fmt_str,
+                                                         args...)
+#define             nm_debug                            (fmt,
+                                                         args...)
+#define             nm_debug_str                        (fmt_str,
+                                                         args...)
+#define             nm_warning                          (fmt,
+                                                         args...)
+#define             nm_warning_str                      (fmt_str,
+                                                         args...)
+#define             nm_error                            (fmt,
+                                                         args...)
+#define             nm_error_str                        (fmt_str,
+                                                         args...)
 gboolean            nm_utils_init                       (GError **error);
 void                nm_utils_deinit                     (void);
 gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
@@ -49,7 +67,8 @@ const char *        gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
                                                          gboolean ignore_trailing_null);
-char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
+char *              nm_utils_ssid_to_utf8               (const char *ssid,
+                                                         guint32 len);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
 void                nm_utils_slist_free                 (GSList *list,
                                                          GDestroyNotify elem_destroy_fn);
@@ -95,16 +114,216 @@ enum                const char *band);
 

 

-

+

 
Description

 

 A collection of utility functions for working SSIDs, IP addresses, WiFi
 access points and devices, among other things.
 

 

-

+

 
Details

-

+

+
nm_print_backtrace

+
#define             nm_print_backtrace()

+

+Prints a backtrace of the calling process to the logging location.
+

+

+

+

+
nm_get_timestamp()

+
#define             nm_get_timestamp(timestamp)

+

+For debugging only.
+

+

++
+
+
+
+


timestamp :
location in which to place the current timestamp
+

+

+

+

+
nm_info()

+
#define             nm_info(fmt, args...)

+

+

+

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


fmt :

+
args... :

+

+

+

+

+
nm_info_str()

+
#define             nm_info_str(fmt_str, args...)

+

+

+

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


fmt_str :

+
args... :

+

+

+

+

+
nm_debug()

+
#define             nm_debug(fmt, args...)

+

+

+

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


fmt :

+
args... :

+

+

+

+

+
nm_debug_str()

+
#define             nm_debug_str(fmt_str, args...)

+

+

+

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


fmt_str :

+
args... :

+

+

+

+

+
nm_warning()

+
#define             nm_warning(fmt, args...)

+

+

+

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


fmt :

+
args... :

+

+

+

+

+
nm_warning_str()

+
#define             nm_warning_str(fmt_str, args...)

+

+

+

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


fmt_str :

+
args... :

+

+

+

+

+
nm_error()

+
#define             nm_error(fmt, args...)

+

+

+

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


fmt :

+
args... :

+

+

+

+

+
nm_error_str()

+
#define             nm_error_str(fmt_str, args...)

+

+

+

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


fmt_str :

+
args... :

+

+

+

+

 
nm_utils_init ()

 
gboolean            nm_utils_init                       (GError **error);

 

@@ -123,13 +342,14 @@ libnm-util can also be done.  This function can be called more than once.
 
 
 
Returns :

-TRUE if the initialization was successful, FALSE on failure.
+ TRUE if the initialization was successful, FALSE on failure.
+
 
 
 

 

 

-

+

 
nm_utils_deinit ()

 
void                nm_utils_deinit                     (void);

 

@@ -140,7 +360,7 @@ called again.
 

 

 

-

+

 
nm_utils_is_empty_ssid ()

 
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
                                                          int len);

@@ -154,7 +374,8 @@ number of known SSID-cloaking methods.
 
 
 
ssid :

-pointer to a buffer containing the SSID data
+pointer to a buffer containing the SSID data
+
 
 
 
len :

@@ -163,13 +384,14 @@ number of known SSID-cloaking methods.
 
 
 
Returns :

-TRUE if the SSID is "empty", FALSE if it is not
+ TRUE if the SSID is "empty", FALSE if it is not
+
 
 
 

 

 

-

+

 
nm_utils_escape_ssid ()

 
const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);

@@ -184,7 +406,8 @@ be used for display of SSIDs.
 
 
 
ssid :

-pointer to a buffer containing the SSID data
+pointer to a buffer containing the SSID data
+
 
 
 
len :

@@ -193,14 +416,15 @@ be used for display of SSIDs.
 
 
 
Returns :

-pointer to the escaped SSID, which uses an internal static buffer
-and will be overwritten by subsequent calls to this function
+ pointer to the escaped SSID, which uses an internal static buffer
+and will be overwritten by subsequent calls to this function
+
 
 
 

 

 

-

+

 
nm_utils_same_ssid ()

 
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
@@ -218,27 +442,32 @@ NULLs, even though that is functionally pointless.
 
 
 
ssid1 :

-first SSID data to compare
+first SSID data to compare
+
 
 
 
ssid2 :

-second SSID data to compare
+second SSID data to compare
+
 
 
 
ignore_trailing_null :

-TRUE to ignore one trailing NULL byte
+TRUE to ignore one trailing NULL byte
+
 
 
 
Returns :

-TRUE if the SSIDs are the same, FALSE if they are not
+ TRUE if the SSIDs are the same, FALSE if they are not
+
 
 
 

 

 

-

+

 
nm_utils_ssid_to_utf8 ()

-
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

+
char *              nm_utils_ssid_to_utf8               (const char *ssid,
+                                                         guint32 len);

 

 WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
@@ -271,20 +500,26 @@ _only_.
 
 
 
ssid :

-a byte array containing the SSID data
+pointer to a buffer containing the SSID data
+
+
+
+
len :

+length of the SSID data in ssid
+
 
 
 
Returns :

-an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. [transfer full]
+ an allocated string containing a UTF-8 representation of the
+SSID, which must be freed by the caller using g_free().  Returns NULL
+on errors.
 
 
 
 

 

 

-

+

 
nm_utils_gvalue_hash_dup ()

 
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

 

@@ -295,19 +530,20 @@ Utility function to duplicate a hash table of GValues.
 
 
 
hash :

-a GHashTable mapping string:GValue
+a GHashTable mapping string:GValue
+
 
 
 
Returns :

-a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
+ a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy()
 
 
 
 

 

 

-

+

 
nm_utils_slist_free ()

 
void                nm_utils_slist_free                 (GSList *list,
                                                          GDestroyNotify elem_destroy_fn);

@@ -331,7 +567,7 @@ Utility function to free a 
+

 
enum NMUtilsSecurityType

 
typedef enum {
 	NMU_SEC_INVALID = 0,
@@ -349,7 +585,7 @@ Utility function to free a 
+

 
nm_utils_security_valid ()

 
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          guint32 wifi_caps,
@@ -380,11 +616,13 @@ e.g. NMU_SEC_STATIC_WEP
 
 
 
have_ap :

-whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
+whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
+
 
 
 
adhoc :

-whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
+whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
+
 
 
 
ap_flags :

@@ -394,29 +632,32 @@ e.g. NMU_SEC_STATIC_WEP
 
 
ap_wpa :

 bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
+e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
+
 
 
 
ap_rsn :

 bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
+e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
+
 
 
 
Returns :

-TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are not
+ TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type, FALSE if they are not
+
 
 
 

 

 

-

+

 
nm_utils_ip4_addresses_from_gvalue ()

 
GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);

 

 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of NMIP4Address objects.  The specific format of
+and prefix) into a GSList of NMIP4Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GArray may be
 extended in the future.
 

@@ -425,23 +666,24 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GArrays of guint32s
+gvalue containing a GPtrArray of GArrays of guint32s
+
 
 
 
Returns :

-a newly allocated GSList of NMIP4Address objects. [transfer full][element-type NetworkManager.IP4Address]
+ a newly allocated GSList of NMIP4Address objects
 
 
 
 

 

 

-

+

 
nm_utils_ip4_addresses_to_gvalue ()

 
void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP4Address objects into a
+Utility function to convert a GSList of NMIP4Address objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
@@ -452,25 +694,27 @@ extended in the future.
 
 
 
list :

-a list of NMIP4Address objects
+a list of NMIP4Address objects
+
 
 
 
value :

 a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
+g_value_unset().
+
 
 
 

 

 

-

+

 
nm_utils_ip4_routes_from_gvalue ()

 
GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);

 

 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of NMIP4Route objects.  The specific
+prefix, and metric) into a GSList of NMIP4Route objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
 

@@ -479,23 +723,24 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GArrays of guint32s
+gvalue containing a GPtrArray of GArrays of guint32s
+
 
 
 
Returns :

-a newly allocated GSList of NMIP4Route objects. [transfer full][element-type NetworkManager.IP4Route]
+ a newly allocated GSList of NMIP4Route objects
 
 
 
 

 

 

-

+

 
nm_utils_ip4_routes_to_gvalue ()

 
void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP4Route objects into a
+Utility function to convert a GSList of NMIP4Route objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
@@ -506,19 +751,21 @@ be extended in the future.
 
 
 
list :

-a list of NMIP4Route objects
+a list of NMIP4Route objects
+
 
 
 
value :

 a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
+g_value_unset().
+
 
 
 

 

 

-

+

 
nm_utils_ip4_netmask_to_prefix ()

 
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

 

@@ -526,17 +773,19 @@ which should be unset by the caller (when no longer needed) with
 
-
+
-
+

 

 
netmask :
an IPv4 netmask in network byte orderan IPv4 netmask in network byte order
+
 

 

 
Returns :
the CIDR prefix represented by the netmask the CIDR prefix represented by the netmask
+
 

 
 

 

 

-

+

 
nm_utils_ip4_prefix_to_netmask ()

 
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

 

@@ -544,17 +793,19 @@ which should be unset by the caller (when no longer needed) with
 
-
+
-
+

 

 
prefix :
a CIDR prefixa CIDR prefix
+
 

 

 
Returns :
the netmask represented by the prefix the netmask represented by the prefix
+
 

 
 

 

 

-

+

 
nm_utils_ip4_get_default_prefix ()

 
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

 

@@ -568,23 +819,25 @@ falls in the predefined classes.
 
 
 
ip :

-an IPv4 address (in network byte order)
+an IPv4 address (in network byte order)
+
 
 
 
Returns :

-the default class prefix for the given IP
+ the default class prefix for the given IP
+
 
 
 

 

 

-

+

 
nm_utils_ip6_addresses_from_gvalue ()

 
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

 

 Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
+prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GValueArray may be
 extended in the future.
 

@@ -593,23 +846,24 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+
 
 
 
Returns :

-a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
+ a newly allocated GSList of NMIP6Address objects
 
 
 
 

 

 

-

+

 
nm_utils_ip6_addresses_to_gvalue ()

 
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP6Address objects into a
+Utility function to convert a GSList of NMIP6Address objects into a
 GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
@@ -620,26 +874,28 @@ future.
 
 
 
list :

-a list of NMIP6Address objects
+a list of NMIP6Address objects
+
 
 
 
value :

 a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
+g_value_unset().
+
 
 
 

 

 

-

+

 
nm_utils_ip6_routes_from_gvalue ()

 
GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);

 

 Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
 (GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of NMIP6Route objects.  The specific format of this serialization
+into a GSList of NMIP6Route objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
 

 

@@ -648,23 +904,24 @@ is not guaranteed to be stable and may be extended in the future.
 
+(GArray of guchars), and guint32
+
-

 
value :

 gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
-(GArray of guchars), and guint32
 

 

 
Returns :
a newly allocated GSList of NMIP6Route objects. [transfer full][element-type NetworkManager.IP6Route]
+ a newly allocated GSList of NMIP6Route objects
 
 

 
 

 

 

-

+

 
nm_utils_ip6_routes_to_gvalue ()

 
void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
+Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
 GValueArrays of (GArray or guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not 
@@ -675,48 +932,80 @@ guaranteed to be stable and may be extended in the future.
 
 
 
list :

-a list of NMIP6Route objects
+a list of NMIP6Route objects
+
 
 
 
value :

 a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
+g_value_unset().
+
 
 
 

 

 

-

+

 
nm_utils_ip6_dns_from_gvalue ()

 
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

 

 

+

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


value :

+
Returns :

+

 

 

-

+

 
nm_utils_ip6_dns_to_gvalue ()

 
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
                                                          GValue *value);

 

 

+

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


list :

+
value :

+

 

 

-

+

 
nm_utils_uuid_generate ()

 
char *              nm_utils_uuid_generate              (void);

 

-

 
 

 
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
+ a newly allocated UUID suitable for use as the NMSettingConnection
 object's "id": property.  Should be freed with g_free()
 
 

 

 

 

-

+

 
nm_utils_uuid_generate_from_string ()

 
char *              nm_utils_uuid_generate_from_string  (const char *s);

 

@@ -727,18 +1016,20 @@ For a given s, this function will always
 
 
 
s :

-a string to use as the seed for the UUID
+a string to use as the seed for the UUID
+
 
 
 
Returns :

-a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property
+ a newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property
+
 
 
 

 

 

-

+

 
nm_utils_rsa_key_encrypt ()

 
GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
@@ -754,34 +1045,36 @@ suitable for writing to a file.
 
 
 
data :

-RSA private key data to be encrypted
+RSA private key data to be encrypted
+
 
 
 
in_password :

-existing password to use, if any. [allow-none]
+existing password to use, if any
 
 
 
 
out_password :

 if in_password was NULL, a random password will be generated
-and returned in this argument. [out][allow-none]
+ and returned in this argument
 
 
 
 
error :

-detailed error information on return, if an error occurred
+detailed error information on return, if an error occurred
+
 
 
 
Returns :

-on success, PEM-formatted data suitable for writing to a PEM-formatted
-certificate/private key file. [transfer full]
+ on success, PEM-formatted data suitable for writing to a PEM-formatted
+certificate/private key file.
 
 
 
 

 

 

-

+

 
nm_utils_wifi_freq_to_channel ()

 
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

 

@@ -792,17 +1085,19 @@ Utility function to translate a WiFi frequency to its corresponding channel.
 
 
 
freq :

-frequency
+frequency
+
 
 
 
Returns :

-the channel represented by the frequency or 0
+ the channel represented by the frequency or 0
+
 
 
 

 

 

-

+

 
nm_utils_wifi_channel_to_freq ()

 
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
                                                          const char *band);

@@ -814,23 +1109,26 @@ Utility function to translate a WiFi channel to its corresponding frequency.
 
 
 
channel :

-channel
+channel
+
 
 
 
band :

-frequency band for wireless ("a" or "bg")
+frequency band for wireless ("a" or "bg")
+
 
 
 
Returns :

-the frequency represented by the channel of the band,
-or -1 when the freq is invalid, or 0 when the band
-is invalid
+ the frequency represented by the channel of the band,
+         or -1 when the freq is invalid, or 0 when the band
+         is invalid
+
 
 
 

 

 

-

+

 
nm_utils_wifi_find_next_channel ()

 
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
                                                          int direction,
@@ -843,25 +1141,29 @@ Utility function to find out next/previous WiFi channel for a channel.
 
 
 
channel :

-current channel
+current channel
+
 
 
 
direction :

-whether going downward (0 or less) or upward (1 or more)
+whether going downward (0 or less) or upward (1 or more)
+
 
 
 
band :

-frequency band for wireless ("a" or "bg")
+frequency band for wireless ("a" or "bg")
+
 
 
 
Returns :

-the next channel in the specified direction or 0
+ the next channel in the specified direction or 0
+
 
 
 

 

 

-

+

 
nm_utils_wifi_is_channel_valid ()

 
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);

@@ -873,15 +1175,18 @@ Utility function to verify WiFi channel validity.
 
 
 
channel :

-channel
+channel
+
 
 
 
band :

-frequency band for wireless ("a" or "bg")
+frequency band for wireless ("a" or "bg")
+
 
 
 
Returns :

-TRUE or FALSE
+ TRUE or FALSE
+
 
 
 

@@ -890,6 +1195,6 @@ Utility function to verify WiFi channel validity.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 3fa339f1..91d080b9 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -3,6 +3,7 @@
 
   
     
+      
       
       
       
@@ -26,6 +27,43 @@
     
   
   
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -35,12 +73,10 @@
     
     
     
-    
     
     
     
     
-    
     
     
     
@@ -55,8 +91,6 @@
     
     
     
-    
-    
     
     
     
@@ -69,7 +103,6 @@
     
     
     
-    
     
     
     
@@ -80,14 +113,8 @@
     
     
     
-    
-    
-    
-    
-    
     
     
-    
     
     
     
@@ -152,8 +179,6 @@
     
     
     
-    
-    
     
     
     
@@ -202,12 +227,9 @@
     
     
     
-    
-    
     
-    
     
-    
+    
     
     
     
@@ -229,27 +251,21 @@
     
     
     
-    
     
     
-    
     
     
     
     
-    
     
     
     
     
     
-    
     
     
     
     
-    
-    
     
     
     
@@ -305,7 +321,6 @@
     
     
     
-    
     
     
     
@@ -313,10 +328,8 @@
     
     
     
-    
     
     
-    
     
     
     
@@ -326,14 +339,19 @@
     
     
     
-    
     
     
     
     
     
-    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -349,18 +367,18 @@
     
     
     
-    
-    
+    
+    
     
     
+    
     
     
     
     
     
-    
     
-    
+    
     
     
     
@@ -402,15 +420,12 @@
     
     
     
-    
     
     
-    
     
     
-    
     
-    
+    
     
     
     
@@ -448,23 +463,35 @@
     
     
     
-    
     
-    
+    
     
     
     
     
     
-    
     
     
     
     
     
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -472,7 +499,6 @@
     
     
     
-    
     
     
     
@@ -483,10 +509,8 @@
     
     
     
-    
     
     
-    
     
     
     
@@ -511,7 +535,6 @@
     
     
     
-    
     
     
     
@@ -524,7 +547,6 @@
     
     
     
-    
     
     
     
@@ -603,7 +625,6 @@
     
     
     
-    
     
     
     
@@ -616,7 +637,6 @@
     
     
     
-    
     
     
     
@@ -739,7 +759,6 @@
     
     
     
-    
     
     
     
@@ -747,9 +766,7 @@
     
     
     
-    
     
-    
     
     
     
@@ -763,7 +780,7 @@
     
     
     
-    
+    
     
     
     
@@ -780,6 +797,16 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 9cb466dd..3f68f0ec 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -3,6 +3,7 @@
 
   
     
+      
       
       
       
@@ -26,6 +27,43 @@
     
   
   
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -35,12 +73,10 @@
     
     
     
-    
     
     
     
     
-    
     
     
     
@@ -55,8 +91,6 @@
     
     
     
-    
-    
     
     
     
@@ -69,7 +103,6 @@
     
     
     
-    
     
     
     
@@ -80,14 +113,8 @@
     
     
     
-    
-    
-    
-    
-    
     
     
-    
     
     
     
@@ -152,8 +179,6 @@
     
     
     
-    
-    
     
     
     
@@ -202,12 +227,9 @@
     
     
     
-    
-    
     
-    
     
-    
+    
     
     
     
@@ -229,27 +251,21 @@
     
     
     
-    
     
     
-    
     
     
     
     
-    
     
     
     
     
     
-    
     
     
     
     
-    
-    
     
     
     
@@ -305,7 +321,6 @@
     
     
     
-    
     
     
     
@@ -313,10 +328,8 @@
     
     
     
-    
     
     
-    
     
     
     
@@ -326,14 +339,19 @@
     
     
     
-    
     
     
     
     
     
-    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -349,18 +367,18 @@
     
     
     
-    
-    
+    
+    
     
     
+    
     
     
     
     
     
-    
     
-    
+    
     
     
     
@@ -402,15 +420,12 @@
     
     
     
-    
     
     
-    
     
     
-    
     
-    
+    
     
     
     
@@ -448,23 +463,35 @@
     
     
     
-    
     
-    
+    
     
     
     
     
     
-    
     
     
     
     
     
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -472,7 +499,6 @@
     
     
     
-    
     
     
     
@@ -483,10 +509,8 @@
     
     
     
-    
     
     
-    
     
     
     
@@ -511,7 +535,6 @@
     
     
     
-    
     
     
     
@@ -524,7 +547,6 @@
     
     
     
-    
     
     
     
@@ -603,7 +625,6 @@
     
     
     
-    
     
     
     
@@ -616,7 +637,6 @@
     
     
     
-    
     
     
     
@@ -739,7 +759,6 @@
     
     
     
-    
     
     
     
@@ -747,9 +766,7 @@
     
     
     
-    
     
-    
     
     
     
@@ -763,7 +780,7 @@
     
     
     
-    
+    
     
     
     
@@ -780,6 +797,16 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -810,17 +837,15 @@
     
     
     
+    
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -832,12 +857,5 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
   
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index bbe2a6d2..11904962 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,12 +19,12 @@
 libnm-util Reference Manual
 Next
 
-

+

 

 Object Hierarchy

 
     GObject
-        NMConnection
+        NMConnection
         NMSetting
             NMSetting8021x
             NMSettingBluetooth
@@ -38,38 +38,13 @@
             NMSettingPPPOE
             NMSettingSerial
             NMSettingVPN
-            NMSettingWimax
             NMSettingWired
             NMSettingWireless
             NMSettingWirelessSecurity
-    GEnum
-        NMConnectionError
-        NMSetting8021xError
-        NMSettingBluetoothError
-        NMSettingCdmaError
-        NMSettingConnectionError
-        NMSettingError
-        NMSettingGsmError
-        NMSettingIP4ConfigError
-        NMSettingIP6ConfigError
-        NMSettingOlpcMeshError
-        NMSettingPPPError
-        NMSettingPPPOEError
-        NMSettingSerialError
-        NMSettingVpnError
-        NMSettingWimaxError
-        NMSettingWiredError
-        NMSettingWirelessError
-        NMSettingWirelessSecurityError
-    GBoxed
-        NMIP4Address
-        NMIP4Route
-        NMIP6Address
-        NMIP6Route
 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.15

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index d6f6c26e..d544a2c2 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -32,9 +32,8 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
-    display: inline-block;
     position: relative;
-    top:-5em;
+    padding-top:4.5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
-- 
cgit 1.3.0-6-gf8a5