diff options
| author | Dan Winship <danw@gnome.org> | 2012-03-09 09:39:58 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2012-03-12 15:29:52 -0400 |
| commit | 54ef8f3224a02aac76623cfa0a7d38c3b3ff7d3e (patch) | |
| tree | 802e0373406bbf89a45051fa97f18ec12e610b41 /libnm-util/nm-setting-wireless.h | |
| parent | 2a1277f0da71257206938efa600c20cded6019f5 (diff) | |
| download | NetworkManager-54ef8f3224a02aac76623cfa0a7d38c3b3ff7d3e.tar.gz | |
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".)
Diffstat (limited to 'libnm-util/nm-setting-wireless.h')
| -rw-r--r-- | libnm-util/nm-setting-wireless.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h index 76d539a408..3182f419b9 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 () |