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

* src/nm-device.c
	  src/nm-device.h
		- (device_activation_precheck, check_connection_complete): remove this
			virtual function; incomplete connections should be invalid by
			definition, complete-ness should be checked in the setting's
			verify function

	* src/nm-serial-device.c
	  src/nm-gsm-device.c
		- (real_check_connection_complete): remove

	* libnm-util/nm-setting-serial.c
		- (verify): new function; ensure there is a PPP setting too

	* libnm-util/nm-setting-gsm.c
		- (verify): ensure there is a serial setting too



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3225 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-01-09 18:27:23 +00:00
parent 925aa2ff3d
commit 2497bea1d2
7 changed files with 63 additions and 65 deletions

View File

@@ -1148,13 +1148,6 @@ device_activation_precheck (NMDevice *self, NMConnection *connection, GError **e
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
if ( NM_DEVICE_GET_CLASS (self)->check_connection_complete
&& !NM_DEVICE_GET_CLASS (self)->check_connection_complete (self, connection, error)) {
/* connection is invalid */
g_assert (*error);
return FALSE;
}
if (nm_device_get_state (self) != NM_DEVICE_STATE_ACTIVATED)
return TRUE;