colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-01-17 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device-interface.c
		- (nm_device_interface_check_connection_conflicts): need to actually
			get the interface, not cast to the object

	* src/nm-device.c
		- (nm_device_check_connection_conflicts): need to get the device class,
			not cast the device to the device class



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3244 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-01-18 03:00:12 +00:00
parent dc92660e6c
commit efd3d2adca
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2008-01-17 Dan Williams <dcbw@redhat.com>
* src/nm-device-interface.c
- (nm_device_interface_check_connection_conflicts): need to actually
get the interface, not cast to the object
* src/nm-device.c
- (nm_device_check_connection_conflicts): need to get the device class,
not cast the device to the device class
2008-01-17 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c

4
src/nm-device-interface.c
View File

@@ -201,10 +201,10 @@ nm_device_interface_check_connection_conflicts (NMDeviceInterface *device,
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (system_connection), FALSE);
if (!device->check_connection_conflicts)
if (!NM_DEVICE_INTERFACE_GET_INTERFACE (device)->check_connection_conflicts)
return FALSE;
return device->check_connection_conflicts (device, connection, system_connection);
return NM_DEVICE_INTERFACE_GET_INTERFACE (device)->check_connection_conflicts (device, connection, system_connection);
}
gboolean

6
src/nm-device.c
View File

@@ -1105,14 +1105,14 @@ nm_device_deactivate (NMDeviceInterface *device)
}
static gboolean
nm_device_check_connection_conflicts (NMDeviceInterface *device,
nm_device_check_connection_conflicts (NMDeviceInterface *dev_iface,
NMConnection *connection,
NMConnection *system_connection)
{
NMDeviceClass *klass = NM_DEVICE_CLASS (NM_DEVICE (device));
NMDeviceClass *klass = NM_DEVICE_GET_CLASS (NM_DEVICE (dev_iface));
if (klass->check_connection_conflicts)
return klass->check_connection_conflicts (NM_DEVICE (device), connection, system_connection);
return klass->check_connection_conflicts (NM_DEVICE (dev_iface), connection, system_connection);
return FALSE;
}