NetworkManager r3242 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Jan 18 02:56:20 2008
New Revision: 3242
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3242&view=rev

Log:
2008-01-17  Dan Williams  <dcbw redhat com>

	* src/NetworkManagerPolicy.c
		- (nm_policy_device_change_check): clear change check idle here
		- (device_change_check_done): remove
		- (schedule_change_check): simplify



Modified:
   trunk/ChangeLog
   trunk/src/NetworkManagerPolicy.c

Modified: trunk/src/NetworkManagerPolicy.c
==============================================================================
--- trunk/src/NetworkManagerPolicy.c	(original)
+++ trunk/src/NetworkManagerPolicy.c	Fri Jan 18 02:56:20 2008
@@ -224,6 +224,8 @@
 	NMDevice * old_dev = NULL;
 	gboolean do_switch = FALSE;
 
+	policy->device_state_changed_idle_id = 0;
+
 	switch (nm_manager_get_state (policy->manager)) {
 	case NM_STATE_CONNECTED:
 		old_dev = nm_manager_get_active_device (policy->manager);
@@ -404,22 +406,13 @@
 }
 
 static void
-device_change_check_done (gpointer user_data)
-{
-	NMPolicy *policy = (NMPolicy *) user_data;
-	policy->device_state_changed_idle_id = 0;
-}
-
-static void
 schedule_change_check (NMPolicy *policy)
 {
 	if (policy->device_state_changed_idle_id > 0)
 		return;
 
-	policy->device_state_changed_idle_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-															nm_policy_device_change_check,
-															policy,
-															device_change_check_done);
+	policy->device_state_changed_idle_id = g_idle_add (nm_policy_device_change_check,
+	                                                   policy);
 }
 
 static NMConnection *