From 5d1d4d185e1de4e400a011bb7d4faa0ba2d553b3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 18 Jan 2008 02:54:55 +0000 Subject: [PATCH] 2008-01-17 Dan Williams * src/nm-manager.c - (check_connection_allowed): take an NMDeviceInterface instead of an NMDevice object as an argument - (nm_manager_activate_device): pass an NMDeviceInterface to check_connection_allowed() git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3241 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/nm-manager.c | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b2f8355f2..16ee31c1f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-17 Dan Williams + + * src/nm-manager.c + - (check_connection_allowed): take an NMDeviceInterface instead of + an NMDevice object as an argument + - (nm_manager_activate_device): pass an NMDeviceInterface to + check_connection_allowed() + 2008-01-13 Dan Williams * libnm-glib/nm-device-802-11-wireless.c diff --git a/src/nm-manager.c b/src/nm-manager.c index 33c06611c0..f11c8bf769 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1163,7 +1163,7 @@ nm_manager_get_device_by_udi (NMManager *manager, const char *udi) static gboolean check_connection_allowed (NMManager *manager, - NMDevice *device, + NMDeviceInterface *dev_iface, NMConnection *connection, const char *specific_object, GError **error) @@ -1183,7 +1183,7 @@ check_connection_allowed (NMManager *manager, if (connection == system_connection) continue; - if (nm_device_interface_check_connection_conflicts (NM_DEVICE_INTERFACE (device), + if (nm_device_interface_check_connection_conflicts (dev_iface, connection, system_connection)) { allowed = FALSE; @@ -1205,18 +1205,21 @@ nm_manager_activate_device (NMManager *manager, GError **error) { NMActRequest *req; + NMDeviceInterface *dev_iface; gboolean success; g_return_val_if_fail (NM_IS_MANAGER (manager), FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); + dev_iface = NM_DEVICE_INTERFACE (device); + /* Ensure the requested connection is allowed to be activated */ - if (!check_connection_allowed (manager, device, connection, specific_object, error)) + if (!check_connection_allowed (manager, dev_iface, connection, specific_object, error)) return FALSE; req = nm_act_request_new (connection, specific_object, user_requested); - success = nm_device_interface_activate (NM_DEVICE_INTERFACE (device), req, error); + success = nm_device_interface_activate (dev_iface, req, error); g_object_unref (req); return success;