From d465e5fac63f36bcf4069e36827f4b62c494556d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 May 2011 19:57:25 +0200 Subject: Imported Upstream version 0.8.9997 --- docs/libnm-util/html/NMSetting.html | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 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 c77c5985..b9c258d2 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -140,7 +140,7 @@ enum 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.

@@ -420,7 +420,7 @@ when calling NMSetting into a GHashTable mapping each setting property name to a GValue describing that property, suitable for marshalling over -D-Bus or serializing. The mapping is string:GValue. +D-Bus or serializing. The mapping is string to GValue.

@@ -437,7 +437,8 @@ D-Bus or serializing. The mapping is string:GValue. - @@ -465,8 +466,9 @@ property names and value types. - + @@ -709,10 +711,11 @@ be set to results :

- @@ -847,8 +850,9 @@ setting (deserialized from D-Bus for example). - + -- cgit 1.3.0-6-gf8a5

Returns :

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

hash :

the GHashTable containing a string:GValue mapping of properties -that apply to the settingthe GHashTable containing a +string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value] +

Returns :

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] +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 and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]

secrets :

a GHashTable mapping string:GValue of setting property names and -secretsa GHashTable mapping +string to GValue of setting property names and secrets. [element-type utf8 GObject.Value] +

error :