Merge ~morphis/snappy-hwe-snaps/+git/network-manager:b/consistent-config-item-names into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

Proposed by Simon Fels
Status: Merged
Approved by: Matteo Croce
Approved revision: 459c0084ad63fa672279c7608e1472904ed9723b
Merged at revision: e3d32a522bdd4392be618e9b20612217da998cd8
Proposed branch: ~morphis/snappy-hwe-snaps/+git/network-manager:b/consistent-config-item-names
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Diff against target: 13 lines (+1/-1)
1 file modified
src/devices/wifi/nm-device-wifi.c (+1/-1)
Reviewer Review Type Date Requested Status
Matteo Croce (community) Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+319403@code.launchpad.net

Description of the change

wifi: be consistent with configuration item naming and use wifi prefix

To post a comment you must log in.
Revision history for this message
Matteo Croce (teknoraver) :
review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Matteo Croce (teknoraver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
2index 48276fb..436b746 100644
3--- a/src/devices/wifi/nm-device-wifi.c
4+++ b/src/devices/wifi/nm-device-wifi.c
5@@ -2435,7 +2435,7 @@ wake_on_wlan_enable (NMDevice *device)
6 }
7
8 value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA,
9- "wireless.wake-on-wlan",
10+ "wifi.wake-on-wlan",
11 device);
12
13 if (value) {

Subscribers

People subscribed via source and target branches