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

2007-06-13 Tambet Ingo <tambet@ximian.com>

Browse Source 
* src/nm-device.c (nm_device_state_changed): Emit the signal before handling it
	because the handling code will cause the next state change and signal listeners
	get the signals in wrong order.

	* src/NetworkManagerPolicy.c (nm_policy_device_change_check): Get the "old_dev"
	correctly in case of pending activation.




git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2593 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2007-06-13 11:58:25 +00:00
committed by Tambet Ingo
parent 77cdb55279
commit be798e43ab
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@@ -1,3 +1,21 @@
2007-06-13 Tambet Ingo <tambet@ximian.com>
* src/nm-device.c (nm_device_state_changed): Emit the signal before handling it
because the handling code will cause the next state change and signal listeners
get the signals in wrong order.
* src/NetworkManagerPolicy.c (nm_policy_device_change_check): Get the "old_dev"
correctly in case of pending activation.
* src/nm-device-802-11-wireless.c (nm_device_802_11_wireless_set_activation_ap):
Convert the essid byte array to string correctly, including the terminating NULL.
* src/NetworkManagerPolicy.c (create_connection): Create wireless ssid and
mode with correct types.
* src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network): Fix a typo, pass the
constructed info to dbus call instead of the activation request.
2007-06-11 Christopher Aillon <caillon@redhat.com> 2007-06-11 Christopher Aillon <caillon@redhat.com>
Patch from Christian Persch <chpe@gnome.org> Patch from Christian Persch <chpe@gnome.org>

19
src/NetworkManagerPolicy.c
View File

@@ -214,12 +214,27 @@ static gboolean
nm_policy_device_change_check (gpointer user_data) nm_policy_device_change_check (gpointer user_data)
{ {
NMPolicy *policy = (NMPolicy *) user_data; NMPolicy *policy = (NMPolicy *) user_data;
GSList *iter;
NMAccessPoint * ap = NULL; NMAccessPoint * ap = NULL;
NMDevice * new_dev; NMDevice * new_dev;
NMDevice * old_dev; NMDevice * old_dev = NULL;
gboolean do_switch = FALSE; gboolean do_switch = FALSE;
old_dev = nm_manager_get_active_device (policy->manager); switch (nm_manager_get_state (policy->manager)) {
case NM_STATE_CONNECTED:
old_dev = nm_manager_get_active_device (policy->manager);
break;
case NM_STATE_CONNECTING:
for (iter = nm_manager_get_devices (policy->manager); iter; iter = iter->next) {
if (nm_device_is_activating (NM_DEVICE (iter->data))) {
old_dev = NM_DEVICE (iter->data);
break;
}
}
break;
default:
break;
}
if (old_dev) { if (old_dev) {
guint32 caps = nm_device_get_capabilities (old_dev); guint32 caps = nm_device_get_capabilities (old_dev);

4
src/nm-device.c
View File

@@ -1521,6 +1521,8 @@ nm_device_state_changed (NMDevice *device, NMDeviceState state)
old_state = device->priv->state; old_state = device->priv->state;
device->priv->state = state; device->priv->state = state;
g_signal_emit_by_name (device, "state-changed", state);
switch (state) { switch (state) {
case NM_DEVICE_STATE_DOWN: case NM_DEVICE_STATE_DOWN:
if (old_state == NM_DEVICE_STATE_ACTIVATED) if (old_state == NM_DEVICE_STATE_ACTIVATED)
@@ -1536,8 +1538,6 @@ nm_device_state_changed (NMDevice *device, NMDeviceState state)
default: default:
break; break;
} }
g_signal_emit_by_name (device, "state-changed", state);
} }