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-8021x.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-8021x.h')
| -rw-r--r-- | libnm-util/nm-setting-8021x.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index fa7086332f..eaca344d9d 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 () |