diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-22 12:28:06 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-22 08:29:08 -0400 |
| commit | fd7b9df47d6598af91b76af64584039ddc5037dc (patch) | |
| tree | b258df16c89a1356400379db6b4caf909285c799 /libnm-core | |
| parent | 4f75ff92b4d5a52d453b77b050f38f8c3e421256 (diff) | |
| download | NetworkManager-fd7b9df47d6598af91b76af64584039ddc5037dc.tar.gz | |
devices: drop device-type-specific error domains
Most NMDevice types defined their own error domain but then never used
it. A few did use their errors, but some of those errors are redundant
with NMDeviceError, and others can be added to it.
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-errors.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libnm-core/nm-errors.h b/libnm-core/nm-errors.h index 7a680e0a32..5c9e4a10b0 100644 --- a/libnm-core/nm-errors.h +++ b/libnm-core/nm-errors.h @@ -98,12 +98,18 @@ GQuark nm_crypto_error_quark (void); /** * NMDeviceError: * @NM_DEVICE_ERROR_FAILED: unknown or unclassified error + * @NM_DEVICE_ERROR_CREATION_FAILED: NetworkManager failed to create the device * @NM_DEVICE_ERROR_INVALID_CONNECTION: the specified connection is not valid * @NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION: the specified connection is not * compatible with this device. * @NM_DEVICE_ERROR_NOT_ACTIVE: the device does not have an active connection * @NM_DEVICE_ERROR_NOT_SOFTWARE: the requested operation is only valid on * software devices. + * @NM_DEVICE_ERROR_NOT_ALLOWED: the requested operation is not allowed at + * this time. + * @NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND: the "specific object" in the + * activation request (eg, the #NMAccessPoint or #NMWimaxNsp) was not + * found. * * Device-related errors. * @@ -113,10 +119,13 @@ GQuark nm_crypto_error_quark (void); */ typedef enum { NM_DEVICE_ERROR_FAILED = 0, /*< nick=Failed >*/ + NM_DEVICE_ERROR_CREATION_FAILED, /*< nick=CreationFailed >*/ NM_DEVICE_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, /*< nick=IncompatibleConnection >*/ NM_DEVICE_ERROR_NOT_ACTIVE, /*< nick=NotActive >*/ NM_DEVICE_ERROR_NOT_SOFTWARE, /*< nick=NotSoftware >*/ + NM_DEVICE_ERROR_NOT_ALLOWED, /*< nick=NotAllowed >*/ + NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND, /*< nick=SpecificObjectNotFound >*/ } NMDeviceError; #define NM_DEVICE_ERROR nm_device_error_quark () |