NetworkManager r3871 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Tue Jul 29 20:25:02 2008
New Revision: 3871
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3871&view=rev

Log:
2008-07-29  Dan Williams  <dcbw redhat com>

	* src/nm-serial-device.c
		- (nm_serial_device_wait_for_reply): fix timeout calculation.  Since
			time(2) is used for current time, which returns seconds, we shouldn't
			be multiplying by 1000.



Modified:
   trunk/ChangeLog
   trunk/src/nm-serial-device.c

Modified: trunk/src/nm-serial-device.c
==============================================================================
--- trunk/src/nm-serial-device.c	(original)
+++ trunk/src/nm-serial-device.c	Tue Jul 29 20:25:02 2008
@@ -768,7 +768,7 @@
 	info->callback = callback;
 	info->user_data = user_data;
 	info->reply_index = -1;
-	info->timeout = timeout * 1000;
+	info->timeout = timeout;
 	info->start = time (NULL);
 
 	return nm_serial_device_set_pending (device, timeout, wait_for_reply_got_data, info, wait_for_reply_done);