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

* src/nm-device.c
		- (nm_device_class_init): connect a default act_stage4_ip_config_timeout
			function.  Fixes crash when wired DHCP fails.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1355 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-01-18 02:27:38 +00:00
parent cdb4eb1e20
commit 135da08fc5
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2006-01-17 Dan Williams <dcbw@redhat.com>
* src/nm-device.c
- (nm_device_class_init): connect a default act_stage4_ip_config_timeout
function. Fixes crash when wired DHCP fails.
2006-01-16 Robert Love <rml@novell.com>
* src/Makefile.am: Don't install NMLoadModules

View file

@ -1111,7 +1111,7 @@ nm_device_activate_stage4_ip_config_timeout (NMActRequest *req)
NMDevice * self = NULL;
NMIP4Config * ip4_config = NULL;
const char * iface;
NMActStageReturn ret;
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
g_return_val_if_fail (req != NULL, FALSE);
@ -1964,6 +1964,7 @@ nm_device_class_init (NMDeviceClass *klass)
klass->act_stage2_config = real_act_stage2_config;
klass->act_stage3_ip_config_start = real_act_stage3_ip_config_start;
klass->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config;
klass->act_stage4_ip_config_timeout = real_act_stage4_ip_config_timeout;
g_type_class_add_private (object_class, sizeof (NMDevicePrivate));
}