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/Makefile.in | 28 +++++++++------ 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 +--- docs/libnm-util/libnm-util-sections.txt | 6 +--- docs/libnm-util/tmpl/nm-setting-connection.sgml | 35 ------------------- docs/libnm-util/tmpl/nm-utils.sgml | 9 +++++ 10 files changed, 56 insertions(+), 127 deletions(-) (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index de0a694a..2d444e76 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,11 +60,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -434,6 +434,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -503,10 +504,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: 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 @@ + diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt index c55c690f..dceb61b7 100644 --- a/docs/libnm-util/libnm-util-sections.txt +++ b/docs/libnm-util/libnm-util-sections.txt @@ -374,11 +374,6 @@ NM_SETTING_CONNECTION_TIMESTAMP NM_SETTING_CONNECTION_TYPE NM_SETTING_CONNECTION_UUID NM_SETTING_CONNECTION_ZONE -NM_SETTING_CONNECTION_ZONE_BLOCK -NM_SETTING_CONNECTION_ZONE_HOME -NM_SETTING_CONNECTION_ZONE_PUBLIC -NM_SETTING_CONNECTION_ZONE_TRUSTED -NM_SETTING_CONNECTION_ZONE_WORK nm_setting_connection_add_permission nm_setting_connection_error_quark nm_setting_connection_get_autoconnect @@ -1074,6 +1069,7 @@ NMUtilsSecurityType NM_UTILS_HWADDR_LEN_MAX nm_utils_deinit nm_utils_escape_ssid +nm_utils_file_is_pkcs12 nm_utils_gvalue_hash_dup nm_utils_hwaddr_atoba nm_utils_hwaddr_aton diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml index cee42ea4..751b1a19 100644 --- a/docs/libnm-util/tmpl/nm-setting-connection.sgml +++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml @@ -182,41 +182,6 @@ NMSettingConnection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml index 9195b502..f7ee74c1 100644 --- a/docs/libnm-util/tmpl/nm-utils.sgml +++ b/docs/libnm-util/tmpl/nm-utils.sgml @@ -60,6 +60,15 @@ nm-utils @Returns: + + + + + +@filename: +@Returns: + + -- cgit 1.3.0-6-gf8a5