2007-12-27 Dan Williams <dcbw@redhat.com>
* src/nm-device-interface.c src/nm-device-interface.h - (nm_device_interface_error_quark, nm_device_interface_error_get_type): normalize and expand errors - (nm_device_interface_init): register errors so they can be marshalled through dbus-glib - (nm_device_interface_activate): ensure that failure of activation returns an error * src/nm-device.c src/nm-device.h - (device_activation_precheck): implementations of check_connection() now take a GError and must fill it in if the check fails. Return more descriptive error if the requested connection is already activating - (nm_device_activate): actually try to return descriptive errors on failures * src/nm-device-802-11-wireless.c src/nm-device-802-3-ethernet.c src/nm-serial-device.c src/nm-gsm-device.c - (real_check_connection): return more descriptive errors on failure * src/NetworkManagerPolicy.c - (nm_policy_device_change_check): print activation errors in the logs * src/nm-manager.c - (nm_manager_error_quark, nm_manager_error_get_type, nm_manager_class_init): new errors - (nm_manager_activate_device): handle errors - (nm_manager_error_new): removed - (wait_for_connection_expired, connection_added_default_handler, impl_manager_activate_device): better error handling git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3197 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -14,11 +14,12 @@
|
||||
|
||||
typedef enum
|
||||
{
|
||||
NM_DEVICE_INTERFACE_ERROR_UNKNOWN_CONNECTION = 0,
|
||||
NM_DEVICE_INTERFACE_ERROR_CONNECTION_ACTIVATING = 0,
|
||||
NM_DEVICE_INTERFACE_ERROR_CONNECTION_INVALID,
|
||||
} NMDeviceInterfaceError;
|
||||
|
||||
#define NM_DEVICE_INTERFACE_ERROR (nm_device_interface_error_quark ())
|
||||
#define NM_DEVICE_INTERFACE_TYPE_ERROR (nm_device_interface_error_get_type ())
|
||||
#define NM_TYPE_DEVICE_INTERFACE_ERROR (nm_device_interface_error_get_type ())
|
||||
|
||||
#define NM_DEVICE_INTERFACE_UDI "udi"
|
||||
#define NM_DEVICE_INTERFACE_IFACE "interface"
|
||||
@@ -52,7 +53,8 @@ struct _NMDeviceInterface {
|
||||
|
||||
/* Methods */
|
||||
gboolean (*activate) (NMDeviceInterface *device,
|
||||
NMActRequest *req);
|
||||
NMActRequest *req,
|
||||
GError **error);
|
||||
|
||||
void (*deactivate) (NMDeviceInterface *device);
|
||||
|
||||
@@ -67,7 +69,8 @@ GType nm_device_interface_error_get_type (void);
|
||||
GType nm_device_interface_get_type (void);
|
||||
|
||||
gboolean nm_device_interface_activate (NMDeviceInterface *device,
|
||||
NMActRequest *req);
|
||||
NMActRequest *req,
|
||||
GError **error);
|
||||
|
||||
void nm_device_interface_deactivate (NMDeviceInterface *device);
|
||||
|
||||
|
Reference in New Issue
Block a user