colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3242 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-01-18 02:56:20 +00:00
parent 5d1d4d185e
commit 2013215c4c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
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
2008-01-17 Dan Williams <dcbw@redhat.com> 2008-01-17 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c * src/nm-manager.c

15
src/NetworkManagerPolicy.c
View File

@@ -224,6 +224,8 @@ nm_policy_device_change_check (gpointer user_data)
NMDevice * old_dev = NULL; NMDevice * old_dev = NULL;
gboolean do_switch = FALSE; gboolean do_switch = FALSE;
policy->device_state_changed_idle_id = 0;
switch (nm_manager_get_state (policy->manager)) { switch (nm_manager_get_state (policy->manager)) {
case NM_STATE_CONNECTED: case NM_STATE_CONNECTED:
old_dev = nm_manager_get_active_device (policy->manager); old_dev = nm_manager_get_active_device (policy->manager);
@@ -403,23 +405,14 @@ global_state_changed (NMManager *manager, NMState state, gpointer user_data)
nm_system_restart_mdns_responder (); nm_system_restart_mdns_responder ();
} }
static void
device_change_check_done (gpointer user_data)
{
NMPolicy *policy = (NMPolicy *) user_data;
policy->device_state_changed_idle_id = 0;
}
static void static void
schedule_change_check (NMPolicy *policy) schedule_change_check (NMPolicy *policy)
{ {
if (policy->device_state_changed_idle_id > 0) if (policy->device_state_changed_idle_id > 0)
return; return;
policy->device_state_changed_idle_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, policy->device_state_changed_idle_id = g_idle_add (nm_policy_device_change_check,
nm_policy_device_change_check, policy);
policy,
device_change_check_done);
} }
static NMConnection * static NMConnection *