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/NMConnection.html | 59 +++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 4 deletions(-) (limited to 'docs/libnm-util/html/NMConnection.html') diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 032f18a3..7d660012 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -3,7 +3,7 @@ NMConnection - + @@ -74,6 +74,10 @@ enum 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, @@ -81,7 +85,7 @@ const char * void nm_connection_clear_secrets (NMConnection *connection); gboolean nm_connection_update_secrets (NMConnection *connection, const char *setting_name, - GHashTable *secrets, + GHashTable *setting_secrets, GError **error); void nm_connection_set_scope (NMConnection *connection, NMConnectionScope scope); @@ -555,6 +559,53 @@ each flag's behavior.
+
+

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,
@@ -651,7 +702,7 @@ keeping secret data in memory when not needed.
 
nm_connection_update_secrets ()

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

 

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

+
setting_secrets :

 a GHashTable mapping string:GValue of setting property names and
 secrets
 
-- 
cgit 1.3.0-6-gf8a5