2007-12-31 Dan Williams <dcbw@redhat.com>
* src/nm-device-interface.c src/nm-device-interface.h - (nm_device_interface_check_connection_conflicts): new function * src/nm-device.c src/nm-device.h - (nm_device_check_connection_conflicts): new function - (device_activation_precheck): don't require subclasses to implement check_connection_complete() - check_connection() -> check_connection_complete() * src/nm-device-802-11-wireless.c - (real_check_connection): remove; unused - (real_check_connection_conflicts): implement, handle lockdown for system connections * src/nm-device-802-3-ethernet.c - (real_check_connection): remove; unused * src/nm-manager.c - (check_connection_allowed): new function - (nm_manager_activate_device): ensure the connection being requested is allowed to be activated * src/nm-serial-device.c src/nm-gsm-device.c - real_check_connection() -> real_check_connection_complete() git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3201 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -52,6 +52,10 @@ struct _NMDeviceInterface {
|
||||
GTypeInterface g_iface;
|
||||
|
||||
/* Methods */
|
||||
gboolean (*check_connection_conflicts) (NMDeviceInterface *device,
|
||||
NMConnection *connection,
|
||||
NMConnection *system_connection);
|
||||
|
||||
gboolean (*activate) (NMDeviceInterface *device,
|
||||
NMActRequest *req,
|
||||
GError **error);
|
||||
@@ -68,6 +72,10 @@ GType nm_device_interface_error_get_type (void);
|
||||
|
||||
GType nm_device_interface_get_type (void);
|
||||
|
||||
gboolean nm_device_interface_check_connection_conflicts (NMDeviceInterface *device,
|
||||
NMConnection *connection,
|
||||
NMConnection *system_connection);
|
||||
|
||||
gboolean nm_device_interface_activate (NMDeviceInterface *device,
|
||||
NMActRequest *req,
|
||||
GError **error);
|
||||
|
||||
Reference in New Issue
Block a user