From 263bf4c0c89bb88dc995acd9a6a2de9095fbd461 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 23 Aug 2011 19:16:47 +0200 Subject: Imported Upstream version 0.9.0 --- docs/libnm-util/html/NMSetting.html | 150 ++++++++++++++++++++++++------------ 1 file changed, 99 insertions(+), 51 deletions(-) (limited to 'docs/libnm-util/html/NMSetting.html') diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index b9c258d2..0cc1fd03 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -54,6 +54,7 @@ enum NMSetti #define NM_SETTING_PARAM_FUZZY_IGNORE #define NM_SETTING_NAME enum NMSettingSecretFlags; +enum NMSettingCompareFlags; NMSetting; NMSettingClass; void (*NMSettingValueIterFn) (NMSetting *setting, @@ -72,7 +73,6 @@ const char * gboolean nm_setting_verify (NMSetting *setting, GSList *all_settings, GError **error); -enum NMSettingCompareFlags; gboolean nm_setting_compare (NMSetting *a, NMSetting *b, NMSettingCompareFlags flags); @@ -122,7 +122,7 @@ enum NMSettingPPPOE +----NMSettingSerial +----NMSettingVPN - +----NMSettingWimax + +----NMSettingWimax +----NMSettingWired +----NMSettingWireless +----NMSettingWirelessSecurity @@ -313,6 +313,64 @@ secret is not required
+

enum NMSettingCompareFlags

+
typedef enum {
+	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
+	NM_SETTING_COMPARE_FLAG_FUZZY = 0x00000001,
+	NM_SETTING_COMPARE_FLAG_IGNORE_ID = 0x00000002,
+	NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS = 0x00000004,
+	NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS = 0x00000008,
+	NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS = 0x00000010
+} NMSettingCompareFlags;
+
+

+These flags modify the comparison behavior when comparing two settings or +two connections. +

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

NM_SETTING_COMPARE_FLAG_EXACT

match all properties exactly +

NM_SETTING_COMPARE_FLAG_FUZZY

match only important attributes, like SSID, + type, security settings, etc. Does not match, for example, connection ID + or UUID. +

NM_SETTING_COMPARE_FLAG_IGNORE_ID

ignore the connection's ID +

NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS

ignore all secrets +

NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS

ignore secrets for which +the secret's flags indicate the secret is owned by a user secret agent +(ie, the secret's flag includes NM_SETTING_SECRET_FLAG_AGENT_OWNED) +

NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS

ignore secrets for which +the secret's flags indicate the secret should not be saved to persistent +storage (ie, the secret's flag includes NM_SETTING_SECRET_FLAG_NOT_SAVED) +
+
+
+

NMSetting

typedef struct _NMSetting NMSetting;

@@ -350,11 +408,16 @@ It should only be accessed through the functions described below. NMSettingSecretFlags flags, GError **error); + /* Returns TRUE if the given property contains the same value in both settings */ + gboolean (*compare_property) (NMSetting *setting, + NMSetting *other, + const GParamSpec *prop_spec, + NMSettingCompareFlags flags); + /* Padding for future expansion */ void (*_reserved1) (void); void (*_reserved2) (void); void (*_reserved3) (void); - void (*_reserved4) (void); } NMSettingClass;

@@ -368,8 +431,35 @@ It should only be accessed through the functions described below. const GValue *value, GParamFlags flags, gpointer user_data); -

-

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

setting :

The setting for which properties are being iterated, given to +nm_setting_enumerate_values() +

key :

The value/property name

value :

The property's value

flags :

The property's flags, like NM_SETTING_PARAM_SECRET +

user_data :

User data passed to nm_setting_enumerate_values() +
@@ -550,7 +640,7 @@ came

error :

-location to store error, or NULL +location to store error, or NULL @@ -563,48 +653,6 @@ came
-

enum NMSettingCompareFlags

-
typedef enum {
-	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
-	NM_SETTING_COMPARE_FLAG_FUZZY = 0x00000001,
-	NM_SETTING_COMPARE_FLAG_IGNORE_ID = 0x00000002,
-	NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS = 0x00000004
-} NMSettingCompareFlags;
-
-

-These flags modify the comparison behavior when comparing two settings or -two connections. -

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

NM_SETTING_COMPARE_FLAG_EXACT

match all properties exactly -

NM_SETTING_COMPARE_FLAG_FUZZY

match only important attributes, like SSID, - type, security settings, etc. Does not match, for example, connection ID - or UUID. -

NM_SETTING_COMPARE_FLAG_IGNORE_ID

ignore the connection's ID -

NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS

ignore secrets -
-
-
-

nm_setting_compare ()

gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
@@ -856,7 +904,7 @@ string to error :

-location to store error, or NULL
+location to store error, or NULL
 
 
 
@@ -897,7 +945,7 @@ handle that secret.
 
 
 
error :

-location to store error, or NULL
+location to store error, or NULL
 
 
 
@@ -937,7 +985,7 @@ handle that secret.
 
 
 
error :

-location to store error, or NULL
+location to store error, or NULL
 
 
 
-- 
cgit 1.3.0-6-gf8a5