Author: dcbw
Date: Fri Jan 18 03:00:12 2008
New Revision: 3244
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3244&view=rev
Log:
2008-01-17 Dan Williams <[EMAIL PROTECTED]>
* 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
Modified:
trunk/ChangeLog
trunk/src/nm-device-interface.c
trunk/src/nm-device.c
Modified: trunk/src/nm-device-interface.c
==============================================================================
--- trunk/src/nm-device-interface.c (original)
+++ trunk/src/nm-device-interface.c Fri Jan 18 03:00:12 2008
@@ -201,10 +201,10 @@
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
Modified: trunk/src/nm-device.c
==============================================================================
--- trunk/src/nm-device.c (original)
+++ trunk/src/nm-device.c Fri Jan 18 03:00:12 2008
@@ -1105,14 +1105,14 @@
}
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;
}
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
