NetworkManager r3358 - trunk/src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Feb 28 22:02:20 2008
New Revision: 3358
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3358&view=rev

Log:
Doesn't need to be a GTimeVal since the microseconds are never used

Modified:
   trunk/src/nm-device-802-11-wireless.c

Modified: trunk/src/nm-device-802-11-wireless.c
==============================================================================
--- trunk/src/nm-device-802-11-wireless.c	(original)
+++ trunk/src/nm-device-802-11-wireless.c	Thu Feb 28 22:02:20 2008
@@ -131,7 +131,7 @@
 	guint32			rate;
 	
 	gboolean			scanning;
-	GTimeVal			scheduled_scan_time;
+	glong			scheduled_scan_time;
 	guint8			scan_interval; /* seconds */
 	guint               pending_scan_id;
 
@@ -1514,7 +1514,7 @@
 	g_get_current_time (&current_time);
 
 	/* Cancel the pending scan only if it would happen later than what is scheduled right now */
-	if (priv->pending_scan_id && (current_time.tv_sec + priv->scan_interval < priv->scheduled_scan_time.tv_sec))
+	if (priv->pending_scan_id && (current_time.tv_sec + priv->scan_interval < priv->scheduled_scan_time))
 		cancel_pending_scan (self);
 
 	if (!priv->pending_scan_id)
@@ -1522,7 +1522,7 @@
 											   request_wireless_scan,
 											   self);
 
-	priv->scheduled_scan_time.tv_sec = current_time.tv_sec + priv->scan_interval;
+	priv->scheduled_scan_time = current_time.tv_sec + priv->scan_interval;
 	if (priv->scan_interval < SCAN_INTERVAL_MAX)
 		priv->scan_interval += SCAN_INTERVAL_STEP;
 }