about summary refs log tree commit diff
path: root/libnm-util/nm-setting-wireless.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-03-24 01:37:02 +0100
committerMichael Biebl <biebl@debian.org>2012-03-24 01:37:02 +0100
commit6d09564a44846697e1b2a4d50fc5272834c33ed9 (patch)
tree562300c45bf4c7d09a2903ccdf1c4d1647989725 /libnm-util/nm-setting-wireless.h
parent1ac8eb294d0f5e38bd08f709047a73e24a5a4dd3 (diff)
parentde06e5715e780baade318f3490ac7a4c9ce84e32 (diff)
Merge tag 'upstream/0.9.4.0'
Upstream version 0.9.4.0
Diffstat (limited to 'libnm-util/nm-setting-wireless.h')
-rw-r--r--libnm-util/nm-setting-wireless.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index 746466be..3182f419 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/libnm-util/nm-setting-wireless.h
@@ -53,16 +53,13 @@ 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_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
-GType nm_setting_wireless_error_get_type (void);
-
 #define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 GQuark nm_setting_wireless_error_quark (void);