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

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