ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/availableTechnologies into lp:ubuntu-system-settings

  1. availableTechnologies
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1526
Merged at revision: 1529
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/availableTechnologies
Merge into: lp:ubuntu-system-settings
Diff against target: 106 lines (+14/-14)
4 files modified
debian/control (+1/-1)
plugins/cellular/Components/MultiSim.qml (+6/-6)
plugins/cellular/Components/RadioSingleSim.qml (+6/-6)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/availableTechnologies
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+270736@code.launchpad.net

Commit message

ported to libqofono 0.82 (modemTechnologies now availableTechnologies)

Description of the change

ported to libqofono 0.82 (modemTechnologies now availableTechnologies)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2390/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4117/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/574
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3358/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4114
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23218

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2390/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

This looks good to me. I couldn't get the silo working though.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-08-24 07:50:13 +0000
3+++ debian/control 2015-09-10 20:18:27 +0000
4@@ -74,7 +74,7 @@
5 qml-module-ubuntu-connectivity (>= 0.5.3),
6 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
7 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
8- qtdeclarative5-ofono0.2 (>=0.70~),
9+ qtdeclarative5-ofono0.2 (>=0.82~),
10 qml-module-qtsysteminfo,
11 qtdeclarative5-ubuntu-content1,
12 qtdeclarative5-ubuntu-settings-components (>> 0.6),
13
14=== modified file 'plugins/cellular/Components/MultiSim.qml'
15--- plugins/cellular/Components/MultiSim.qml 2015-08-06 17:12:34 +0000
16+++ plugins/cellular/Components/MultiSim.qml 2015-09-10 20:18:27 +0000
17@@ -100,7 +100,7 @@
18
19 expanded: true
20 text: sim.title
21- model: sim.radioSettings.modemTechnologies
22+ model: sim.radioSettings.availableTechnologies
23 delegate: OptionSelectorDelegate {
24 objectName: sim.path + "_radio_" + modelData
25 text: sim.techToString(modelData)
26@@ -122,9 +122,9 @@
27 Connections {
28 target: sim.radioSettings
29 onTechnologyPreferenceChanged: radio.selectedIndex =
30- sim.radioSettings.modemTechnologies.indexOf(preference)
31+ sim.radioSettings.availableTechnologies.indexOf(preference)
32
33- onModemTechnologiesChanged: {
34+ onAvailableTechnologiesChanged: {
35 if ((technologies.indexOf('umts') === -1)
36 && (sim.mtkSettings.has3G === false)) {
37 radio.model = sim.addUmtsEnableToModel(technologies);
38@@ -138,11 +138,11 @@
39 }
40
41 Component.onCompleted: {
42- if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
43+ if ((sim.radioSettings.availableTechnologies.indexOf('umts') === -1)
44 && (sim.mtkSettings.has3G === false)) {
45- radio.model = sim.addUmtsEnableToModel(sim.radioSettings.modemTechnologies);
46+ radio.model = sim.addUmtsEnableToModel(sim.radioSettings.availableTechnologies);
47 } else {
48- radio.model = sim.radioSettings.modemTechnologies;
49+ radio.model = sim.radioSettings.availableTechnologies;
50 }
51 }
52 }
53
54=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
55--- plugins/cellular/Components/RadioSingleSim.qml 2015-01-21 20:44:20 +0000
56+++ plugins/cellular/Components/RadioSingleSim.qml 2015-09-10 20:18:27 +0000
57@@ -39,7 +39,7 @@
58 // an empty string is not a valid preference, which means
59 // we disregard the interace and disable the selector
60 enabled: parent.enabled
61- model: sim.radioSettings.modemTechnologies
62+ model: sim.radioSettings.availableTechnologies
63 delegate: OptionSelectorDelegate {
64 objectName: sim.path + "_radio_" + modelData
65 text: sim.techToString(modelData)
66@@ -63,9 +63,9 @@
67 target: sim.radioSettings
68
69 onTechnologyPreferenceChanged: selector.selectedIndex =
70- sim.radioSettings.modemTechnologies.indexOf(preference)
71+ sim.radioSettings.availableTechnologies.indexOf(preference)
72
73- onModemTechnologiesChanged: {
74+ onAvailableTechnologiesChanged: {
75 if ((technologies.indexOf('umts') === -1)
76 && (sim.mtkSettings.has3G === false)) {
77 selector.model = sim.addUmtsEnableToModel(technologies);
78@@ -79,12 +79,12 @@
79 }
80
81 Component.onCompleted: {
82- if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
83+ if ((sim.radioSettings.availableTechnologies.indexOf('umts') === -1)
84 && (sim.mtkSettings.has3G === false)) {
85 selector.model = sim.addUmtsEnableToModel(
86- sim.radioSettings.modemTechnologies);
87+ sim.radioSettings.availableTechnologies);
88 } else {
89- selector.model = sim.radioSettings.modemTechnologies;
90+ selector.model = sim.radioSettings.availableTechnologies;
91 }
92 }
93 }
94
95=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
96--- tests/autopilot/ubuntu_system_settings/tests/__init__.py 2015-08-06 20:05:56 +0000
97+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py 2015-09-10 20:18:27 +0000
98@@ -238,7 +238,7 @@
99 modem.AddProperty(
100 RDO_IFACE, 'TechnologyPreference', preference)
101 modem.AddProperty(
102- RDO_IFACE, 'ModemTechnologies', technologies)
103+ RDO_IFACE, 'AvailableTechnologies', technologies)
104 modem.AddMethods(
105 RDO_IFACE,
106 [('GetProperties', '', 'a{sv}',

Subscribers

People subscribed via source and target branches