From e22c6e05e9ebc6cce941762020c5710b8014677b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 18 Mar 2011 20:17:47 +0100 Subject: Imported Upstream version 0.8.3.998 --- docs/libnm-util/html/NMSetting.html | 96 ++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) (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 dbfd9855..a31c80d4 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -3,7 +3,7 @@ NMSetting - + @@ -73,6 +73,12 @@ enum gboolean nm_setting_compare (NMSetting *a, NMSetting *b, NMSettingCompareFlags flags); +enum NMSettingDiffResult; +gboolean nm_setting_diff (NMSetting *a, + NMSetting *b, + NMSettingCompareFlags flags, + gboolean invert_results, + GHashTable **results); void nm_setting_enumerate_values (NMSetting *setting, NMSettingValueIterFn func, gpointer user_data); @@ -561,6 +567,94 @@ for a description of each flag's behavior.
+
+

enum NMSettingDiffResult

+
typedef enum {
+	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
+	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
+	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
+} NMSettingDiffResult;
+
+

+These values indicate the result of a setting difference operation. +

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

NM_SETTING_DIFF_RESULT_UNKNOWN

unknown result +

NM_SETTING_DIFF_RESULT_IN_A

the property is present in setting A +

NM_SETTING_DIFF_RESULT_IN_B

the property is present in setting B +
+
+
+
+

nm_setting_diff ()

+
gboolean            nm_setting_diff                     (NMSetting *a,
+                                                         NMSetting *b,
+                                                         NMSettingCompareFlags flags,
+                                                         gboolean invert_results,
+                                                         GHashTable **results);
+

+Compares two NMSetting objects for similarity, with comparison behavior +modified by a set of flags. See the documentation for NMSettingCompareFlags +for a description of each flag's behavior. If the settings differ, the keys +of each setting that differ from the other are added to results, mapped to +one or more NMSettingDiffResult values. +

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

a :

a NMSetting +

b :

a second NMSetting to compare with the first +

flags :

compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT +

invert_results :

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

results :

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

Returns :

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

nm_setting_enumerate_values ()

void                nm_setting_enumerate_values         (NMSetting *setting,
-- 
cgit 1.3.0-6-gf8a5