From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- docs/libnm-util/html/NMSettingOlpcMesh.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'docs/libnm-util/html/NMSettingOlpcMesh.html') diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html index 1f24e2a5..15992600 100644 --- a/docs/libnm-util/html/NMSettingOlpcMesh.html +++ b/docs/libnm-util/html/NMSettingOlpcMesh.html @@ -46,6 +46,7 @@ enum NMSettingOlpcMeshError; #define NM_SETTING_OLPC_MESH_CHANNEL #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS +#define NM_SETTING_OLPC_MESH_ERROR #define NM_SETTING_OLPC_MESH_SETTING_NAME #define NM_SETTING_OLPC_MESH_SSID GQuark nm_setting_olpc_mesh_error_quark (void); @@ -109,9 +110,9 @@ const

enum NMSettingOlpcMeshError

typedef enum {
-	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,
-	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
+	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingOlpcMeshError;

@@ -135,6 +136,14 @@ const +

NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+
+

+

+ +
+

NM_SETTING_OLPC_MESH_SETTING_NAME

#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
-- cgit 1.3.0-6-gf8a5