Merge lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278-rtm into lp:ubuntu-system-settings/rtm-14.09
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1006 |
Merged at revision: | 1007 |
Proposed branch: | lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278-rtm |
Merge into: | lp:ubuntu-system-settings/rtm-14.09 |
Prerequisite: | lp:~jonas-drange/ubuntu-system-settings/apn-no-overwrite-1415495-rtm |
Diff against target: |
260 lines (+136/-38) 4 files modified
plugins/cellular/CMakeLists.txt (+1/-0) plugins/cellular/CustomApnEditor.qml (+70/-10) plugins/cellular/PageChooseApn.qml (+4/-28) plugins/cellular/apn.js (+61/-0) |
To merge this branch: | bzr merge lp:~jonas-drange/ubuntu-system-settings/no-empty-contexts-1433278-rtm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ken VanDine | Approve | ||
Review via email: mp+254412@code.launchpad.net |
This proposal supersedes a proposal from 2015-03-27.
Commit message
[cellular/apn] no creation of custom contexts on editor exit
Description of the change
What changed:
I moved creation of a new, custom internet context to when the user presses "Activate".
Why did I add apn.js:
I want to move the tons of JavaScript code out of the QML and into a nice, documented collection of helper code.
How to test this:
1. $ /usr/share/
Note: If you have not tweaked APNs, ofono should automatically restore your APNs after you remove them completely (and reboot/restart ofono).
2. Open up the APN editor and press "Custom Internet APN"
3. Immediately press Cancel or even "<"
4. Confirm no new contexts were created.
* /var/lib/
Clean backport, thanks