NetworkManager r3372 - in trunk: . src
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: NetworkManager r3372 - in trunk: . src
- Date: Mon, 3 Mar 2008 04:14:28 +0000 (GMT)
Author: dcbw
Date: Mon Mar 3 04:14:28 2008
New Revision: 3372
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3372&view=rev
Log:
2008-03-02 Dan Williams <dcbw redhat com>
* src/NetworkManagerPolicy.c
- s/device_state_changed_idle_id/update_state_id/
Modified:
trunk/ChangeLog
trunk/src/NetworkManagerPolicy.c
Modified: trunk/src/NetworkManagerPolicy.c
==============================================================================
--- trunk/src/NetworkManagerPolicy.c (original)
+++ trunk/src/NetworkManagerPolicy.c Mon Mar 3 04:14:28 2008
@@ -43,7 +43,7 @@
struct NMPolicy {
NMManager *manager;
- guint device_state_changed_idle_id;
+ guint update_state_id;
GSList *signal_ids;
};
@@ -225,7 +225,7 @@
NMDevice * old_dev = NULL;
gboolean do_switch = FALSE;
- policy->device_state_changed_idle_id = 0;
+ policy->update_state_id = 0;
switch (nm_manager_get_state (policy->manager)) {
case NM_STATE_CONNECTED:
@@ -432,10 +432,10 @@
static void
schedule_change_check (NMPolicy *policy)
{
- if (policy->device_state_changed_idle_id > 0)
+ if (policy->update_state_id > 0)
return;
- policy->device_state_changed_idle_id = g_idle_add (nm_policy_device_change_check,
+ policy->update_state_id = g_idle_add (nm_policy_device_change_check,
policy);
}
@@ -596,7 +596,7 @@
policy = g_malloc0 (sizeof (NMPolicy));
policy->manager = g_object_ref (manager);
- policy->device_state_changed_idle_id = 0;
+ policy->update_state_id = 0;
id = g_signal_connect (manager, "state-change",
G_CALLBACK (global_state_changed), policy);
@@ -640,9 +640,9 @@
g_return_if_fail (policy != NULL);
- if (policy->device_state_changed_idle_id) {
- g_source_remove (policy->device_state_changed_idle_id);
- policy->device_state_changed_idle_id = 0;
+ if (policy->update_state_id) {
+ g_source_remove (policy->update_state_id);
+ policy->update_state_id = 0;
}
for (iter = policy->signal_ids; iter; iter = g_slist_next (iter))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]