Merge lp:~jonas-drange/ubuntu-system-settings/apn-entry-independent-of-powered-rtm into lp:ubuntu-system-settings/rtm-14.09

Proposed by Jonas G. Drange
Status: Merged
Approved by: Ken VanDine
Approved revision: 1006
Merged at revision: 1008
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/apn-entry-independent-of-powered-rtm
Merge into: lp:ubuntu-system-settings/rtm-14.09
Diff against target: 31 lines (+0/-3)
2 files modified
plugins/cellular/PageCarrierAndApn.qml (+0/-1)
plugins/cellular/PageCarriersAndApns.qml (+0/-2)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/apn-entry-independent-of-powered-rtm
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ken VanDine Approve
Review via email: mp+254414@code.launchpad.net

Commit message

[cellular/apn] make apn entry enabled always

Description of the change

[cellular/apn] make apn entry enabled always

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Clean backport, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/cellular/PageCarrierAndApn.qml'
2--- plugins/cellular/PageCarrierAndApn.qml 2014-12-16 16:22:29 +0000
3+++ plugins/cellular/PageCarrierAndApn.qml 2015-03-27 15:35:31 +0000
4@@ -57,7 +57,6 @@
5 text: i18n.tr("APN")
6 objectName: "apn"
7 progression: enabled
8- enabled: sim.connMan.powered
9 onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
10 sim: sim
11 })
12
13=== modified file 'plugins/cellular/PageCarriersAndApns.qml'
14--- plugins/cellular/PageCarriersAndApns.qml 2014-12-16 16:22:29 +0000
15+++ plugins/cellular/PageCarriersAndApns.qml 2015-03-27 15:35:31 +0000
16@@ -61,7 +61,6 @@
17 ListItem.Standard {
18 text: i18n.tr("APN")
19 progression: enabled
20- enabled: sims[0].connMan.powered
21 onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
22 sim: sims[0]
23 })
24@@ -88,7 +87,6 @@
25 ListItem.Standard {
26 text: i18n.tr("APN")
27 progression: enabled
28- enabled: sims[1].connMan.powered
29 onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
30 sim: sims[1]
31 })

Subscribers

People subscribed via source and target branches