From 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 14:23:24 +0200 Subject: Imported Upstream version 0.9.5.96 --- docs/libnm-util/html/NMSettingConnection.html | 45 --------------------------- docs/libnm-util/html/api-index-full.html | 24 +++----------- docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.sgml | 6 +--- docs/libnm-util/html/libnm-util-nm-utils.html | 22 +++++++++++++ docs/libnm-util/html/libnm-util.devhelp2 | 6 +--- 6 files changed, 29 insertions(+), 76 deletions(-) (limited to 'docs/libnm-util/html') diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index 339919d2..f83cfc86 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -59,11 +59,6 @@ enum NM_SETTING_CONNECTION_TYPE #define NM_SETTING_CONNECTION_UUID #define NM_SETTING_CONNECTION_ZONE -#define NM_SETTING_CONNECTION_ZONE_BLOCK -#define NM_SETTING_CONNECTION_ZONE_HOME -#define NM_SETTING_CONNECTION_ZONE_PUBLIC -#define NM_SETTING_CONNECTION_ZONE_TRUSTED -#define NM_SETTING_CONNECTION_ZONE_WORK gboolean nm_setting_connection_add_permission (NMSettingConnection *setting, const char *ptype, @@ -312,46 +307,6 @@ Describes errors that may result from operations involving a
-

NM_SETTING_CONNECTION_ZONE_BLOCK

-
#define NM_SETTING_CONNECTION_ZONE_BLOCK     "block"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_HOME

-
#define NM_SETTING_CONNECTION_ZONE_HOME      "home"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_PUBLIC

-
#define NM_SETTING_CONNECTION_ZONE_PUBLIC    "public"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_TRUSTED

-
#define NM_SETTING_CONNECTION_ZONE_TRUSTED   "trusted"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_WORK

-
#define NM_SETTING_CONNECTION_ZONE_WORK      "work"
-
-

-

-
-
-

nm_setting_connection_add_permission ()

gboolean            nm_setting_connection_add_permission
                                                         (NMSettingConnection *setting,
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 7ceff0ba..053cb332 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2261,26 +2261,6 @@ NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
 
 

 

-NM_SETTING_CONNECTION_ZONE_BLOCK, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_HOME, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_PUBLIC, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_TRUSTED, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_WORK, macro in NMSettingConnection
-

-

-

 nm_setting_diff, function in NMSetting
 

 

@@ -3858,6 +3838,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

+nm_utils_file_is_pkcs12, function in nm-utils
+

+

+

 nm_utils_gvalue_hash_dup, function in nm-utils
 

 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 1cddc6b2..39768bae 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference
NMConnection — Describes a connection to specific network or provider diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index c2b27338..e8f2d4ea 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -161,11 +161,6 @@ - - - - - @@ -1261,6 +1256,7 @@ + diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index a4404b33..92edd6e8 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -47,6 +47,7 @@ enum void nm_utils_deinit (void); const char * nm_utils_escape_ssid (const guint8 *ssid, guint32 len); +gboolean nm_utils_file_is_pkcs12 (const char *filename); GHashTable * nm_utils_gvalue_hash_dup (GHashTable *hash); GByteArray * nm_utils_hwaddr_atoba (const char *asc, int type); @@ -250,6 +251,27 @@ and will be overwritten by subsequent calls to this function
+

nm_utils_file_is_pkcs12 ()

+
gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+

+Utility function to find out if the filename is in PKCS12 format. +

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

filename :

name of the file to test

Returns :

TRUE if the file is PKCS12, FALSE if it is not
+
+
+

nm_utils_gvalue_hash_dup ()

GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index fb3955a3..93646eec 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -135,11 +135,6 @@ - - - - - @@ -956,6 +951,7 @@ + -- cgit 1.3.0-6-gf8a5