Fix names of error enum values

When NM was registering all of its enum types by hand, it was using
NamesLikeThis rather than the default names-like-this for the "nick"
values. When we switched to using glib-mkenums, this resulted in
dbus-glib using different strings for the D-Bus error names, causing
compatibility problems.

Fix this by using glib-mkenums annotations to manually fix all the
enum values back to what they were before. (This can't be done in a
more automated way, because the old names aren't 100% consistent. Eg,
"UNKNOWN" frequently becomes "UnknownError" rather than just
"Unknown".)

21 files changed, 81 insertions, 81 deletions

diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index def022e7..6df74f57 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -78,10 +78,10 @@ G_BEGIN_DECLS
  **/
 typedef enum
 {
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
-	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-	NM_CONNECTION_ERROR_SETTING_NOT_FOUND
+	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
+	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, /*< nick=ConnectionSettingNotFound >*/
+	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,      /*< nick=ConnectionTypeInvalid >*/
+	NM_CONNECTION_ERROR_SETTING_NOT_FOUND             /*< nick=SettingNotFound >*/
 } NMConnectionError;
 
 #define NM_CONNECTION_ERROR nm_connection_error_quark ()
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index fa708633..eaca344d 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/libnm-util/nm-setting-8021x.h
@@ -86,9 +86,9 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
  * required
  */
 typedef enum { /*< underscore_name=nm_setting_802_1x_error >*/
-	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,
-	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
-	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY
+	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSetting8021xError;
 
 #define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
diff --git a/libnm-util/nm-setting-bluetooth.h b/libnm-util/nm-setting-bluetooth.h
index 1dd679fd..d76da8db 100644
--- a/libnm-util/nm-setting-bluetooth.h
+++ b/libnm-util/nm-setting-bluetooth.h
@@ -51,10 +51,10 @@ G_BEGIN_DECLS
  * must also contain an #NMSettingGsm or #NMSettingCdma as appropriate
  */
 typedef enum {
-	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,
-	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
-	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND,
+	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
 } NMSettingBluetoothError;
 
 #define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h
index 1980964b..1904505a 100644
--- a/libnm-util/nm-setting-bond.h
+++ b/libnm-util/nm-setting-bond.h
@@ -45,9 +45,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_BOND_ERROR_UNKNOWN = 0,
-	NM_SETTING_BOND_ERROR_INVALID_PROPERTY,
-	NM_SETTING_BOND_ERROR_MISSING_PROPERTY,
+	NM_SETTING_BOND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BOND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BOND_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingBondError;
 
 #define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h
index 229bb32b..a9491efb 100644
--- a/libnm-util/nm-setting-cdma.h
+++ b/libnm-util/nm-setting-cdma.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * is missing in the connection
  */
 typedef enum {
-	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,
-	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingCdmaError;
 
 #define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
diff --git a/libnm-util/nm-setting-connection.h b/libnm-util/nm-setting-connection.h
index da9c03a2..19874845 100644
--- a/libnm-util/nm-setting-connection.h
+++ b/libnm-util/nm-setting-connection.h
@@ -58,11 +58,11 @@ G_BEGIN_DECLS
  **/
 typedef enum
 {
-	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
-	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND,
-	NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
+	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
+	NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,  /*< nick=IpConfigNotAllowed >*/
 } NMSettingConnectionError;
 
 #define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 69183d46..af3efc2c 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * is missing in the connection
  */
 typedef enum {
-	NM_SETTING_GSM_ERROR_UNKNOWN = 0,
-	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,
-	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING
+	NM_SETTING_GSM_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingGsmError;
 
 #define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h
index 90cd6ed9..dc8e8ad0 100644
--- a/libnm-util/nm-setting-infiniband.h
+++ b/libnm-util/nm-setting-infiniband.h
@@ -43,9 +43,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_INFINIBAND_ERROR_UNKNOWN = 0,
-	NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
-	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY
+	NM_SETTING_INFINIBAND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingInfinibandError;
 
 #define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h
index 2db34eeb..52fa54e1 100644
--- a/libnm-util/nm-setting-ip4-config.h
+++ b/libnm-util/nm-setting-ip4-config.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * not valid with the given IP4 method
  */
 typedef enum {
-	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP4ConfigError;
 
 #define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 57f9fdc8..55b48b2d 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -50,10 +50,10 @@ G_BEGIN_DECLS
  * not valid with the given IPv6 method
  */
 typedef enum {
-	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,
-	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
-	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
+	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
+	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP6ConfigError;
 
 #define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h
index c693610a..d6940401 100644
--- a/libnm-util/nm-setting-olpc-mesh.h
+++ b/libnm-util/nm-setting-olpc-mesh.h
@@ -43,9 +43,9 @@ G_BEGIN_DECLS
 
 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;
 
 #define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h
index 5dcdf904..072dd23c 100644
--- a/libnm-util/nm-setting-ppp.h
+++ b/libnm-util/nm-setting-ppp.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * with other setting configuration parameters
  */
 typedef enum {
-	NM_SETTING_PPP_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
+	NM_SETTING_PPP_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
+	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,        /*< nick=InvalidProperty >*/
+	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,        /*< nick=MissingProperty >*/
+	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
 } NMSettingPPPError;
 
 #define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h
index 6ec13760..087e9902 100644
--- a/libnm-util/nm-setting-pppoe.h
+++ b/libnm-util/nm-setting-pppoe.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * did not contain a required PPP setting for PPP related options
  */
 typedef enum {
-	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,
-	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,
-	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingPPPOEError;
 
 #define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h
index b1fa7bc4..8c2a79b9 100644
--- a/libnm-util/nm-setting-serial.h
+++ b/libnm-util/nm-setting-serial.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
  * setting requires the connection to contain an #NMSettingPPP setting
  */
 typedef enum {
-	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,
-	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,
-	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING
+	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
+	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
+	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingSerialError;
 
 #define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
diff --git a/libnm-util/nm-setting-vlan.h b/libnm-util/nm-setting-vlan.h
index 12a6574d..18c7ed29 100644
--- a/libnm-util/nm-setting-vlan.h
+++ b/libnm-util/nm-setting-vlan.h
@@ -46,9 +46,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,
-	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
-	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY
+	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
+	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingVlanError;
 
 #define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h
index bfd2ac57..59068f88 100644
--- a/libnm-util/nm-setting-vpn.h
+++ b/libnm-util/nm-setting-vpn.h
@@ -47,9 +47,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_VPN_ERROR_UNKNOWN = 0,
-	NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
-	NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
+	NM_SETTING_VPN_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_VPN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingVpnError;
 
 #define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h
index 6991b8e7..be3a47e5 100644
--- a/libnm-util/nm-setting-wimax.h
+++ b/libnm-util/nm-setting-wimax.h
@@ -43,9 +43,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWimaxError;
 
 #define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h
index 9eae7f2e..0189785f 100644
--- a/libnm-util/nm-setting-wired.h
+++ b/libnm-util/nm-setting-wired.h
@@ -47,9 +47,9 @@ G_BEGIN_DECLS
  * required
  */
 typedef enum {
-	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY
+	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWiredError;
 
 #define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 0240b031..54dfcce8 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -56,13 +56,13 @@ G_BEGIN_DECLS
  * encryption protocol
  */
 typedef enum {
-	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME,
-	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP
+	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, /*< nick=Missing8021xSetting >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,   /*< nick=LEAPRequires8021x >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, /*< nick=LEAPRequiresUsername >*/
+	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
 } NMSettingWirelessSecurityError;
 
 #define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index 76d539a4..3182f419 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/libnm-util/nm-setting-wireless.h
@@ -53,11 +53,11 @@ G_BEGIN_DECLS
  * set to a value that requires the #NMSettingWireless:band property to be set
  */
 typedef enum {
-	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,
-	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,
-	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING,
-	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND
+	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,         /*< nick=MissingProperty >*/
+	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, /*< nick=MissingSecuritySetting >*/
+	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
 } NMSettingWirelessError;
 
 #define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index 3a909255..6cc6ed3e 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -54,10 +54,10 @@ G_BEGIN_DECLS
  **/
 typedef enum
 {
-	NM_SETTING_ERROR_UNKNOWN = 0,
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
+	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
 } NMSettingError;
 
 #define NM_SETTING_ERROR nm_setting_error_quark ()