diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-10-26 16:32:29 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-10-26 16:32:29 +0000 |
| commit | 1cb9bacaad88bc870be6dd9b2200226703ae4df2 (patch) | |
| tree | 7383dc5e9b70c9d8180c20e4f1d4cdd84f0bb62c /src/nm-device-wifi.c | |
| parent | 6d86495f71eec283090663a71d4148fa1d59ad57 (diff) | |
2008-10-26 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-interface.c
src/supplicant-manager/nm-supplicant-interface.h
src/supplicant-manager/nm-supplicant-manager.c
src/supplicant-manager/nm-supplicant-manager.h
- Add state-to-string conversion functions
* src/nm-device-wifi.c
src/nm-device-ethernet.c
- Normalize state info logging and use strings instead of numbers
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4213 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/nm-device-wifi.c')
| -rw-r--r-- | src/nm-device-wifi.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index b66dcd1b39..7cabe0fe73 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -2191,10 +2191,10 @@ supplicant_iface_state_cb_handler (gpointer user_data) self = task->self; priv = NM_DEVICE_WIFI_GET_PRIVATE (self); - nm_info ("(%s): supplicant interface state change: %d -> %d.", - nm_device_get_iface (NM_DEVICE (self)), - task->old_state, - task->new_state); + nm_info ("(%s): supplicant interface state: %s -> %s", + nm_device_get_iface (NM_DEVICE (self)), + nm_supplicant_interface_state_to_string (task->old_state), + nm_supplicant_interface_state_to_string (task->new_state)); if (task->new_state == NM_SUPPLICANT_INTERFACE_STATE_READY) { priv->scan_interval = SCAN_INTERVAL_MIN; @@ -2243,8 +2243,10 @@ supplicant_iface_connection_state_cb_handler (gpointer user_data) goto out; } - nm_info ("(%s): supplicant connection state change: %d -> %d", - nm_device_get_iface (dev), task->old_state, task->new_state); + nm_info ("(%s): supplicant connection state: %s -> %s", + nm_device_get_iface (dev), + nm_supplicant_interface_connection_state_to_string (task->old_state), + nm_supplicant_interface_connection_state_to_string (task->new_state)); priv->scanning = (task->new_state == NM_SUPPLICANT_INTERFACE_CON_STATE_SCANNING); @@ -2315,9 +2317,10 @@ supplicant_mgr_state_cb_handler (gpointer user_data) priv = NM_DEVICE_WIFI_GET_PRIVATE (self); dev = NM_DEVICE (self); - nm_info ("(%s): supplicant manager is now in state %d (from %d).", - nm_device_get_iface (NM_DEVICE (self)), - task->new_state, task->old_state); + nm_info ("(%s): supplicant manager state: %s -> %s", + nm_device_get_iface (NM_DEVICE (self)), + nm_supplicant_manager_state_to_string (task->old_state), + nm_supplicant_manager_state_to_string (task->new_state)); /* If the supplicant went away, release the supplicant interface */ if (task->new_state == NM_SUPPLICANT_MANAGER_STATE_DOWN) { |