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/NMConnection.html | 37 +++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 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 489a2fd6..c700c0d9 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -84,7 +84,7 @@ const char * void nm_connection_clear_secrets (NMConnection *connection); gboolean nm_connection_update_secrets (NMConnection *connection, const char *setting_name, - GHashTable *setting_secrets, + GHashTable *secrets, GError **error); void nm_connection_set_path (NMConnection *connection, const char *path); @@ -123,7 +123,7 @@ const char * NMConnection *connection); NMSettingVPN * nm_connection_get_setting_vpn (NMConnection *connection); -NMSettingWimax * nm_connection_get_setting_wimax +NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection); NMSettingWired * nm_connection_get_setting_wired (NMConnection *connection); @@ -182,7 +182,8 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters { NM_CONNECTION_ERROR_UNKNOWN = 0, NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, - NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID + NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID, + NM_CONNECTION_ERROR_SETTING_NOT_FOUND } NMConnectionError;

@@ -211,6 +212,12 @@ Describes errors that may result from operations involving a NMSettingWireless. + +

NM_CONNECTION_ERROR_SETTING_NOT_FOUND

+the NMConnection object + did not contain the specified NMSetting object + + @@ -505,7 +512,7 @@ added to the

error :

-location to store error, or NULL +location to store error, or NULL @@ -626,7 +633,7 @@ setting and which property failed validation, and how it failed validation.

error :

-location to store error, or NULL +location to store error, or NULL @@ -696,13 +703,15 @@ keeping secret data in memory when not needed.

nm_connection_update_secrets ()

gboolean            nm_connection_update_secrets        (NMConnection *connection,
                                                          const char *setting_name,
-                                                         GHashTable *setting_secrets,
+                                                         GHashTable *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). Will also extract the given setting's secrets hash if given a hash of hashes, as would -be returned from nm_connection_to_hash(). +be returned from nm_connection_to_hash(). If setting_name is NULL, expects +a fully serialized NMConnection as returned by nm_connection_to_hash() and +will update all secrets from all settings contained in secrets.

@@ -717,21 +726,21 @@ be returned from the setting object name to which the secrets apply - + - +TRUE if the secrets were successfully updated, FALSE if the update +failed (tried to update secrets for a setting that doesn't exist, etc)

setting_secrets :

secrets :

 a GHashTable mapping string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]

error :

location to store error, or NULL +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
@@ -1226,10 +1235,10 @@ A shortcut to return any

nm_connection_get_setting_wimax ()

-
NMSettingWimax *            nm_connection_get_setting_wimax
+
NMSettingWimax *            nm_connection_get_setting_wimax
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingWimax the connection might contain.
+A shortcut to return any NMSettingWimax the connection might contain.
 

 
@@ -1241,7 +1250,7 @@ A shortcut to return any NMSettingWimax the connection
 
-
-- 
cgit 1.3.0-6-gf8a5



 

 

 
Returns :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]