From 54ef8f3224a02aac76623cfa0a7d38c3b3ff7d3e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 9 Mar 2012 09:39:58 -0500 Subject: [PATCH] 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".) --- libnm-glib/nm-remote-settings.h | 6 ++--- libnm-glib/nm-secret-agent.h | 12 ++++----- libnm-glib/nm-vpn-plugin.h | 18 ++++++------- libnm-util/nm-connection.h | 8 +++--- libnm-util/nm-setting-8021x.h | 6 ++--- libnm-util/nm-setting-bluetooth.h | 8 +++--- libnm-util/nm-setting-bond.h | 6 ++--- libnm-util/nm-setting-cdma.h | 8 +++--- libnm-util/nm-setting-connection.h | 10 +++---- libnm-util/nm-setting-gsm.h | 8 +++--- libnm-util/nm-setting-infiniband.h | 6 ++--- libnm-util/nm-setting-ip4-config.h | 8 +++--- libnm-util/nm-setting-ip6-config.h | 8 +++--- libnm-util/nm-setting-olpc-mesh.h | 6 ++--- libnm-util/nm-setting-ppp.h | 8 +++--- libnm-util/nm-setting-pppoe.h | 8 +++--- libnm-util/nm-setting-serial.h | 8 +++--- libnm-util/nm-setting-vlan.h | 6 ++--- libnm-util/nm-setting-vpn.h | 6 ++--- libnm-util/nm-setting-wimax.h | 6 ++--- libnm-util/nm-setting-wired.h | 6 ++--- libnm-util/nm-setting-wireless-security.h | 14 +++++----- libnm-util/nm-setting-wireless.h | 10 +++---- libnm-util/nm-setting.h | 8 +++--- src/dhcp-manager/nm-dhcp-manager.h | 4 +-- src/logging/nm-logging.h | 4 +-- src/modem-manager/nm-modem-cdma.h | 6 ++--- src/modem-manager/nm-modem-gsm.h | 6 ++--- src/nm-config.h | 2 +- src/nm-device-bond.h | 6 ++--- src/nm-device-bt.h | 6 ++--- src/nm-device-ethernet.h | 6 ++--- src/nm-device-infiniband.h | 6 ++--- src/nm-device-olpc-mesh.h | 6 ++--- src/nm-device-vlan.h | 6 ++--- src/nm-device-wifi.h | 8 +++--- src/nm-device.h | 6 ++--- src/nm-manager.h | 20 +++++++------- src/nm-session-utils.h | 8 +++--- src/settings/nm-agent-manager.h | 14 +++++----- src/settings/nm-settings-error.h | 32 +++++++++++------------ src/vpn-manager/nm-vpn-manager.h | 8 +++--- src/wimax/nm-device-wimax.h | 8 +++--- 43 files changed, 180 insertions(+), 180 deletions(-) diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index 510c954016..dd6c5a344f 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -50,9 +50,9 @@ G_BEGIN_DECLS * **/ typedef enum { - NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0, - NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED, - NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, + NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ + NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED, /*< nick=ConnectionRemoved >*/ + NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/ } NMRemoteSettingsError; #define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark () diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h index 6a513baed8..19f257ec36 100644 --- a/libnm-glib/nm-secret-agent.h +++ b/libnm-glib/nm-secret-agent.h @@ -30,12 +30,12 @@ G_BEGIN_DECLS GQuark nm_secret_agent_error_quark (void); typedef enum { - NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, - NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, - NM_SECRET_AGENT_ERROR_USER_CANCELED, - NM_SECRET_AGENT_ERROR_AGENT_CANCELED, - NM_SECRET_AGENT_ERROR_INTERNAL_ERROR, - NM_SECRET_AGENT_ERROR_NO_SECRETS, + NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, /*< nick=NotAuthorized >*/ + NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ + NM_SECRET_AGENT_ERROR_USER_CANCELED, /*< nick=UserCanceled >*/ + NM_SECRET_AGENT_ERROR_AGENT_CANCELED, /*< nick=AgentCanceled >*/ + NM_SECRET_AGENT_ERROR_INTERNAL_ERROR, /*< nick=InternalError >*/ + NM_SECRET_AGENT_ERROR_NO_SECRETS, /*< nick=NoSecrets >*/ } NMSecretAgentError; /** diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index d80a3fc6c1..15cbf686c3 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -43,15 +43,15 @@ G_BEGIN_DECLS #define NM_VPN_PLUGIN_STATE "state" typedef enum { - NM_VPN_PLUGIN_ERROR_GENERAL, - NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, - NM_VPN_PLUGIN_ERROR_ALREADY_STARTED, - NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, - NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED, - NM_VPN_PLUGIN_ERROR_WRONG_STATE, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, + NM_VPN_PLUGIN_ERROR_GENERAL, /*< nick=General >*/ + NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, /*< nick=StartingInProgress >*/ + NM_VPN_PLUGIN_ERROR_ALREADY_STARTED, /*< nick=AlreadyStarted >*/ + NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, /*< nick=StoppingInProgress >*/ + NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED, /*< nick=AlreadyStopped >*/ + NM_VPN_PLUGIN_ERROR_WRONG_STATE, /*< nick=WrongState >*/ + NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, /*< nick=BadArguments >*/ + NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, /*< nick=LaunchFailed >*/ + NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ } NMVPNPluginError; #define NM_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_quark ()) diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index def022e765..6df74f5739 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 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 () diff --git a/libnm-util/nm-setting-bluetooth.h b/libnm-util/nm-setting-bluetooth.h index 1dd679fd3d..d76da8dbc9 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 1980964b5f..1904505ac4 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 229bb32b57..a9491efb66 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 da9c03a2d5..1987484512 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 69183d4642..af3efc2cdb 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 90cd6ed935..dc8e8ad0e3 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 2db34eeb91..52fa54e125 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 57f9fdc828..55b48b2def 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 c693610a71..d6940401bc 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 5dcdf904a7..072dd23c36 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 6ec137600e..087e990201 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 b1fa7bc4b7..8c2a79b94b 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 12a6574d90..18c7ed29ab 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 bfd2ac5776..59068f8830 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 6991b8e7dc..be3a47e500 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 9eae7f2e7b..0189785faa 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 0240b031b7..54dfcce812 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 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 () diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 3a9092555f..6cc6ed3e88 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 () diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index a5cfb0469d..d585c1425b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -34,8 +34,8 @@ #include "nm-hostname-provider.h" typedef enum { - NM_DHCP_MANAGER_ERROR_BAD_CLIENT = 0, - NM_DHCP_MANAGER_ERROR_INTERNAL = 1, + NM_DHCP_MANAGER_ERROR_BAD_CLIENT = 0, /*< nick=BadClient >*/ + NM_DHCP_MANAGER_ERROR_INTERNAL = 1, /*< nick=InternalError >*/ } NMDHCPManagerError; #define NM_DHCP_MANAGER_ERROR (nm_dhcp_manager_error_quark ()) diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index 5567698311..7e27f311ba 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -67,8 +67,8 @@ enum { }; typedef enum { - NM_LOGGING_ERROR_UNKNOWN_LEVEL = 0, - NM_LOGGING_ERROR_UNKNOWN_DOMAIN = 1, + NM_LOGGING_ERROR_UNKNOWN_LEVEL = 0, /*< nick=UnknownLevel >*/ + NM_LOGGING_ERROR_UNKNOWN_DOMAIN = 1, /*< nick=UnknownDomain >*/ } NMLoggingError; #define NM_LOGGING_ERROR (nm_logging_error_quark ()) diff --git a/src/modem-manager/nm-modem-cdma.h b/src/modem-manager/nm-modem-cdma.h index 8882dac9b2..2229c18375 100644 --- a/src/modem-manager/nm-modem-cdma.h +++ b/src/modem-manager/nm-modem-cdma.h @@ -34,9 +34,9 @@ G_BEGIN_DECLS #define NM_MODEM_CDMA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MODEM_CDMA, NMModemCdmaClass)) typedef enum { - NM_CDMA_ERROR_CONNECTION_NOT_CDMA = 0, - NM_CDMA_ERROR_CONNECTION_INVALID, - NM_CDMA_ERROR_CONNECTION_INCOMPATIBLE, + NM_CDMA_ERROR_CONNECTION_NOT_CDMA = 0, /*< nick=ConnectionNotCdma >*/ + NM_CDMA_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_CDMA_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMCdmaError; typedef struct { diff --git a/src/modem-manager/nm-modem-gsm.h b/src/modem-manager/nm-modem-gsm.h index d3a115079d..e1c94f045c 100644 --- a/src/modem-manager/nm-modem-gsm.h +++ b/src/modem-manager/nm-modem-gsm.h @@ -34,9 +34,9 @@ G_BEGIN_DECLS #define NM_MODEM_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MODEM_GSM, NMModemGsmClass)) typedef enum { - NM_GSM_ERROR_CONNECTION_NOT_GSM = 0, - NM_GSM_ERROR_CONNECTION_INVALID, - NM_GSM_ERROR_CONNECTION_INCOMPATIBLE, + NM_GSM_ERROR_CONNECTION_NOT_GSM = 0, /*< nick=ConnectionNotGsm >*/ + NM_GSM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_GSM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMGsmError; typedef struct { diff --git a/src/nm-config.h b/src/nm-config.h index cce89dddc2..6c4206c132 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -27,7 +27,7 @@ typedef struct NMConfig NMConfig; typedef enum { - NM_CONFIG_ERROR_NO_MEMORY = 0, + NM_CONFIG_ERROR_NO_MEMORY = 0, /*< nick=NoMemory >*/ } NMConfigError; #define NM_CONFIG_ERROR (nm_config_error_quark ()) diff --git a/src/nm-device-bond.h b/src/nm-device-bond.h index c05580eed8..50ca45eafd 100644 --- a/src/nm-device-bond.h +++ b/src/nm-device-bond.h @@ -35,9 +35,9 @@ G_BEGIN_DECLS #define NM_DEVICE_BOND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BOND, NMDeviceBondClass)) typedef enum { - NM_BOND_ERROR_CONNECTION_NOT_BOND = 0, - NM_BOND_ERROR_CONNECTION_INVALID, - NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, + NM_BOND_ERROR_CONNECTION_NOT_BOND = 0, /*< nick=ConnectionNotBond >*/ + NM_BOND_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMBondError; #define NM_DEVICE_BOND_HW_ADDRESS "hw-address" diff --git a/src/nm-device-bt.h b/src/nm-device-bt.h index d6a3875d64..0d54d6079a 100644 --- a/src/nm-device-bt.h +++ b/src/nm-device-bt.h @@ -34,9 +34,9 @@ G_BEGIN_DECLS #define NM_DEVICE_BT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BT, NMDeviceBtClass)) typedef enum { - NM_BT_ERROR_CONNECTION_NOT_BT = 0, - NM_BT_ERROR_CONNECTION_INVALID, - NM_BT_ERROR_CONNECTION_INCOMPATIBLE, + NM_BT_ERROR_CONNECTION_NOT_BT = 0, /*< nick=ConnectionNotBt >*/ + NM_BT_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_BT_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMBtError; #define NM_DEVICE_BT_HW_ADDRESS "hw-address" diff --git a/src/nm-device-ethernet.h b/src/nm-device-ethernet.h index 9a7ff9fa99..deb0fecad6 100644 --- a/src/nm-device-ethernet.h +++ b/src/nm-device-ethernet.h @@ -37,9 +37,9 @@ G_BEGIN_DECLS typedef enum { - NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED = 0, - NM_ETHERNET_ERROR_CONNECTION_INVALID, - NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, + NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED = 0, /*< nick=ConnectionNotWired >*/ + NM_ETHERNET_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMEthernetError; #define NM_DEVICE_ETHERNET_HW_ADDRESS "hw-address" diff --git a/src/nm-device-infiniband.h b/src/nm-device-infiniband.h index d4c78b4633..fe88c9013c 100644 --- a/src/nm-device-infiniband.h +++ b/src/nm-device-infiniband.h @@ -35,9 +35,9 @@ G_BEGIN_DECLS #define NM_DEVICE_INFINIBAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfinibandClass)) typedef enum { - NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND = 0, - NM_INFINIBAND_ERROR_CONNECTION_INVALID, - NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, + NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND = 0, /*< nick=ConnectionNotInfiniband >*/ + NM_INFINIBAND_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMInfinibandError; #define NM_DEVICE_INFINIBAND_HW_ADDRESS "hw-address" diff --git a/src/nm-device-olpc-mesh.h b/src/nm-device-olpc-mesh.h index cf3b695e87..9d42ecfaf6 100644 --- a/src/nm-device-olpc-mesh.h +++ b/src/nm-device-olpc-mesh.h @@ -44,9 +44,9 @@ G_BEGIN_DECLS typedef enum { - NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH = 0, - NM_OLPC_MESH_ERROR_CONNECTION_INVALID, - NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, + NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH = 0, /*< nick=ConnectionNotMesh >*/ + NM_OLPC_MESH_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMOlpcMeshError; #define NM_DEVICE_OLPC_MESH_HW_ADDRESS "hw-address" diff --git a/src/nm-device-vlan.h b/src/nm-device-vlan.h index 7a7a14f1b5..7c5fa24c99 100644 --- a/src/nm-device-vlan.h +++ b/src/nm-device-vlan.h @@ -35,9 +35,9 @@ G_BEGIN_DECLS #define NM_DEVICE_VLAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_VLAN, NMDeviceVlanClass)) typedef enum { - NM_VLAN_ERROR_CONNECTION_NOT_VLAN = 0, - NM_VLAN_ERROR_CONNECTION_INVALID, - NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, + NM_VLAN_ERROR_CONNECTION_NOT_VLAN = 0, /*< nick=ConnectionNotVlan >*/ + NM_VLAN_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMVlanError; #define NM_DEVICE_VLAN_HW_ADDRESS "hw-address" diff --git a/src/nm-device-wifi.h b/src/nm-device-wifi.h index 73a554f3d5..1e665fc3a6 100644 --- a/src/nm-device-wifi.h +++ b/src/nm-device-wifi.h @@ -42,10 +42,10 @@ G_BEGIN_DECLS #define NM_DEVICE_WIFI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass)) typedef enum { - NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS = 0, - NM_WIFI_ERROR_CONNECTION_INVALID, - NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, - NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, + NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS = 0, /*< nick=ConnectionNotWireless >*/ + NM_WIFI_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ + NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, /*< nick=AccessPointNotFound >*/ } NMWifiError; #define NM_DEVICE_WIFI_HW_ADDRESS "hw-address" diff --git a/src/nm-device.h b/src/nm-device.h index 5a8cb7a6ae..bf76ecb58c 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -72,9 +72,9 @@ G_BEGIN_DECLS typedef enum NMActStageReturn NMActStageReturn; typedef enum { - NM_DEVICE_ERROR_CONNECTION_ACTIVATING = 0, - NM_DEVICE_ERROR_CONNECTION_INVALID, - NM_DEVICE_ERROR_NOT_ACTIVE, + NM_DEVICE_ERROR_CONNECTION_ACTIVATING = 0, /*< nick=ConnectionActivating >*/ + NM_DEVICE_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_DEVICE_ERROR_NOT_ACTIVE, /*< nick=NotActive >*/ } NMDeviceError; typedef struct { diff --git a/src/nm-manager.h b/src/nm-manager.h index 2e56655635..58ba460520 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -36,16 +36,16 @@ #define NM_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MANAGER, NMManagerClass)) typedef enum { - NM_MANAGER_ERROR_UNKNOWN_CONNECTION = 0, - NM_MANAGER_ERROR_UNKNOWN_DEVICE, - NM_MANAGER_ERROR_UNMANAGED_DEVICE, - NM_MANAGER_ERROR_SYSTEM_CONNECTION, - NM_MANAGER_ERROR_PERMISSION_DENIED, - NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, - NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, - NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, - NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, - NM_MANAGER_ERROR_DEPENDENCY_FAILED, + NM_MANAGER_ERROR_UNKNOWN_CONNECTION = 0, /*< nick=UnknownConnection >*/ + NM_MANAGER_ERROR_UNKNOWN_DEVICE, /*< nick=UnknownDevice >*/ + NM_MANAGER_ERROR_UNMANAGED_DEVICE, /*< nick=UnmanagedDevice >*/ + NM_MANAGER_ERROR_SYSTEM_CONNECTION, /*< nick=SystemConnection >*/ + NM_MANAGER_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ + NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, /*< nick=ConnectionNotActive >*/ + NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, /*< nick=AlreadyAsleepOrAwake >*/ + NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, /*< nick=AlreadyEnabledOrDisabled >*/ + NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, /*< nick=UnsupportedConnectionType >*/ + NM_MANAGER_ERROR_DEPENDENCY_FAILED, /*< nick=DependencyFailed >*/ } NMManagerError; #define NM_MANAGER_VERSION "version" diff --git a/src/nm-session-utils.h b/src/nm-session-utils.h index 6ec4a528cb..54b6d4c43a 100644 --- a/src/nm-session-utils.h +++ b/src/nm-session-utils.h @@ -28,10 +28,10 @@ GQuark nm_session_monitor_error_quark (void) G_GNUC_CONST; GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; typedef enum { - NM_SESSION_MONITOR_ERROR_IO_ERROR = 0, - NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, - NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, - NM_SESSION_MONITOR_ERROR_NO_DATABASE, + NM_SESSION_MONITOR_ERROR_IO_ERROR = 0, /*< nick=IOError >*/ + NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, /*< nick=MalformedDatabase >*/ + NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, /*< nick=UnknownUser >*/ + NM_SESSION_MONITOR_ERROR_NO_DATABASE, /*< nick=NoDatabase >*/ } NMSessionMonitorError; gboolean nm_session_uid_to_user (uid_t uid, const char **out_user, GError **error); diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h index 99af11e935..9e8de44bb8 100644 --- a/src/settings/nm-agent-manager.h +++ b/src/settings/nm-agent-manager.h @@ -35,13 +35,13 @@ #define NM_AGENT_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_AGENT_MANAGER, NMAgentManagerClass)) typedef enum { - NM_AGENT_MANAGER_ERROR_SENDER_UNKNOWN = 0, - NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED, - NM_AGENT_MANAGER_ERROR_SESSION_NOT_FOUND, - NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER, - NM_AGENT_MANAGER_ERROR_NOT_REGISTERED, - NM_AGENT_MANAGER_ERROR_INTERNAL_ERROR, - NM_AGENT_MANAGER_ERROR_NO_SECRETS + NM_AGENT_MANAGER_ERROR_SENDER_UNKNOWN = 0, /*< nick=SenderUnknown >*/ + NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ + NM_AGENT_MANAGER_ERROR_SESSION_NOT_FOUND, /*< nick=SessionNotFound >*/ + NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER, /*< nick=InvalidIdentifier >*/ + NM_AGENT_MANAGER_ERROR_NOT_REGISTERED, /*< nick=NotRegistered >*/ + NM_AGENT_MANAGER_ERROR_INTERNAL_ERROR, /*< nick=InternalError >*/ + NM_AGENT_MANAGER_ERROR_NO_SECRETS /*< nick=NoSecrets >*/ } NMAgentManagerError; typedef struct { diff --git a/src/settings/nm-settings-error.h b/src/settings/nm-settings-error.h index cdc076db25..82132c6f33 100644 --- a/src/settings/nm-settings-error.h +++ b/src/settings/nm-settings-error.h @@ -26,22 +26,22 @@ #include typedef enum { - NM_SETTINGS_ERROR_GENERAL = 0, - NM_SETTINGS_ERROR_INVALID_CONNECTION, - NM_SETTINGS_ERROR_READ_ONLY_CONNECTION, - NM_SETTINGS_ERROR_INTERNAL_ERROR, - NM_SETTINGS_ERROR_SECRETS_UNAVAILABLE, - NM_SETTINGS_ERROR_SECRETS_REQUEST_CANCELED, - NM_SETTINGS_ERROR_PERMISSION_DENIED, - NM_SETTINGS_ERROR_INVALID_SETTING, - NM_SETTINGS_ERROR_NOT_PRIVILEGED, - NM_SETTINGS_ERROR_ADD_NOT_SUPPORTED, - NM_SETTINGS_ERROR_UPDATE_NOT_SUPPORTED, - NM_SETTINGS_ERROR_DELETE_NOT_SUPPORTED, - NM_SETTINGS_ERROR_ADD_FAILED, - NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, - NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED, - NM_SETTINGS_ERROR_UUID_EXISTS, + NM_SETTINGS_ERROR_GENERAL = 0, /*< nick=GeneralError >*/ + NM_SETTINGS_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ + NM_SETTINGS_ERROR_READ_ONLY_CONNECTION, /*< nick=ReadOnlyConnection >*/ + NM_SETTINGS_ERROR_INTERNAL_ERROR, /*< nick=InternalError >*/ + NM_SETTINGS_ERROR_SECRETS_UNAVAILABLE, /*< nick=SecretsUnavailable >*/ + NM_SETTINGS_ERROR_SECRETS_REQUEST_CANCELED, /*< nick=SecretsRequestCanceled >*/ + NM_SETTINGS_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ + NM_SETTINGS_ERROR_INVALID_SETTING, /*< nick=InvalidSetting >*/ + NM_SETTINGS_ERROR_NOT_PRIVILEGED, /*< nick=NotPrivileged >*/ + NM_SETTINGS_ERROR_ADD_NOT_SUPPORTED, /*< nick=AddNotSupported >*/ + NM_SETTINGS_ERROR_UPDATE_NOT_SUPPORTED, /*< nick=UpdateNotSupported >*/ + NM_SETTINGS_ERROR_DELETE_NOT_SUPPORTED, /*< nick=DeleteNotSupported >*/ + NM_SETTINGS_ERROR_ADD_FAILED, /*< nick=AddFailed >*/ + NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, /*< nick=SaveHostnameNotSupported >*/ + NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED, /*< nick=SaveHostnameFailed >*/ + NM_SETTINGS_ERROR_UUID_EXISTS, /*< nick=UuidExists >*/ } NMSettingsError; #define NM_SETTINGS_ERROR (nm_settings_error_quark ()) diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 7eab6c5608..cec370c8f1 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -35,10 +35,10 @@ typedef enum { - NM_VPN_MANAGER_ERROR_DEVICE_NOT_ACTIVE = 0, - NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, - NM_VPN_MANAGER_ERROR_SERVICE_INVALID, - NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, + NM_VPN_MANAGER_ERROR_DEVICE_NOT_ACTIVE = 0, /*< nick=BaseDeviceNotActive >*/ + NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_VPN_MANAGER_ERROR_SERVICE_INVALID, /*< nick=ServiceInvalid >*/ + NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, /*< nick=ServiceStartFailed >*/ } NMVPNManagerError; #define NM_VPN_MANAGER_ERROR (nm_vpn_manager_error_quark ()) diff --git a/src/wimax/nm-device-wimax.h b/src/wimax/nm-device-wimax.h index 06a4fd4613..a67ff17d04 100644 --- a/src/wimax/nm-device-wimax.h +++ b/src/wimax/nm-device-wimax.h @@ -37,10 +37,10 @@ G_BEGIN_DECLS typedef enum { - NM_WIMAX_ERROR_CONNECTION_NOT_WIMAX = 0, - NM_WIMAX_ERROR_CONNECTION_INVALID, - NM_WIMAX_ERROR_CONNECTION_INCOMPATIBLE, - NM_WIMAX_ERROR_NSP_NOT_FOUND, + NM_WIMAX_ERROR_CONNECTION_NOT_WIMAX = 0, /*< nick=ConnectionNotWimax >*/ + NM_WIMAX_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ + NM_WIMAX_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ + NM_WIMAX_ERROR_NSP_NOT_FOUND, /*< nick=NspNotFound >*/ } NMWimaxError; #define NM_DEVICE_WIMAX_HW_ADDRESS "hw-address"