From 69099f3e80dde14b4556c95fbdde7f01b913cdbc Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sat, 11 Oct 2014 14:44:10 -0400 Subject: libnm: merge device-type-specific errors into NMDeviceError As with the settings, each device type was defining its own error type, containing either redundant or non-useful error codes. Drop all of the subtype-specific errors, and reduce things to just NM_DEVICE_ERROR_FAILED, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, and NM_DEVICE_ERROR_INVALID_CONNECTION. The device-type-specific errors were only returned from their nm_device_connection_compatible() implementations, so this is also a good opportunity to simplify those, by moving duplicated functionality into the base NMDevice implementation, and then allowing the subclasses to assume that the connection has already been validated in their own code. Most of the implementations now just check that the connection has the correct type for the device (which can't be done at the NMDevice level since some device types (eg, Ethernet) support multiple connection types.) Also, make sure that all of the error messages are localized. --- po/POTFILES.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'po') diff --git a/po/POTFILES.in b/po/POTFILES.in index 1657eae4fb..fe6b57e2bd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -100,6 +100,20 @@ libnm-util/nm-setting-wired.c libnm-util/nm-setting-wireless-security.c libnm-util/nm-setting-wireless.c libnm-util/nm-utils.c +libnm/nm-device-adsl.c +libnm/nm-device-bond.c +libnm/nm-device-bridge.c +libnm/nm-device-bt.c +libnm/nm-device-ethernet.c +libnm/nm-device-generic.c +libnm/nm-device-infiniband.c +libnm/nm-device-modem.c +libnm/nm-device-olpc-mesh.c +libnm/nm-device-team.c +libnm/nm-device-vlan.c +libnm/nm-device-wifi.c +libnm/nm-device-wimax.c +libnm/nm-device.c libnm/nm-object.c libnm/nm-remote-connection.c libnm/nm-vpn-plugin.c -- cgit v1.2.1