Merge lp:~boiko/dialer-app/rtm-fix_call_end_warnings into lp:dialer-app/rtm-14.09

Proposed by Gustavo Pichorim Boiko on 2015-01-21
Status: Merged
Approved by: Bill Filler on 2015-02-11
Approved revision: 252
Merged at revision: 261
Proposed branch: lp:~boiko/dialer-app/rtm-fix_call_end_warnings
Merge into: lp:dialer-app/rtm-14.09
Diff against target: 81 lines (+17/-4)
3 files modified
src/qml/LiveCallPage/LiveCall.qml (+13/-1)
src/qml/LiveCallPage/MultiCallDisplay.qml (+2/-2)
src/qml/dialer-app.qml (+2/-1)
To merge this branch: bzr merge lp:~boiko/dialer-app/rtm-fix_call_end_warnings
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-01-21 Pending
Review via email: mp+247168@code.launchpad.net

Commit message

Fix a lot of warnings.

Description of the change

Fix a lot of warnings.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
2--- src/qml/LiveCallPage/LiveCall.qml 2014-12-16 01:11:54 +0000
3+++ src/qml/LiveCallPage/LiveCall.qml 2015-01-21 16:37:32 +0000
4@@ -32,6 +32,7 @@
5 objectName: "pageLiveCall"
6
7 property var call: callManager.foregroundCall
8+ property var calls: callManager.calls
9 property string dtmfEntry: ""
10 property alias number: contactWatcher.phoneNumber
11 property bool onHold: call ? call.held : false
12@@ -80,6 +81,7 @@
13 return;
14 }
15 statusLabel.text = text;
16+ callConnection.target = null;
17 liveCall.call = callObject;
18 liveCall.dtmfVisible = false;
19 closeTimer.running = true;
20@@ -105,11 +107,21 @@
21 }
22
23 Connections {
24+ id: callConnection
25 target: call
26 onCallEnded: {
27 var callObject = {};
28 callObject["elapsedTime"] = call.elapsedTime;
29 callObject["active"] = true;
30+ callObject["voicemail"] = call.voicemail;
31+ callObject["account"] = call.account;
32+ callObject["phoneNumber"] = call.phoneNumber;
33+ callObject["held"] = call.held;
34+ callObject["muted"] = call.muted;
35+ callObject["activeAudioOutput"] = call.activeAudioOutput;
36+ callObject["audioOutputs"] = call.audioOutputs;
37+ callObject["isConference"] = call.isConference;
38+
39 reportStatus(callObject, i18n.tr("Call ended"));
40 }
41 }
42@@ -455,7 +467,7 @@
43 }
44
45 width: childrenRect.width
46- height: childrenRect.height
47+ height: swapButton.height
48 opacity: multiCall && !dtmfVisible ? 1 : 0
49 enabled : opacity > 0
50 spacing: units.gu(3)
51
52=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
53--- src/qml/LiveCallPage/MultiCallDisplay.qml 2014-08-25 23:40:35 +0000
54+++ src/qml/LiveCallPage/MultiCallDisplay.qml 2015-01-21 16:37:32 +0000
55@@ -45,8 +45,8 @@
56
57 height: units.gu(10) + conferenceArea.height
58 anchors {
59- left: parent.left
60- right: parent.right
61+ left: parent ? parent.left : undefined
62+ right: parent ? parent.right : undefined
63 }
64
65 ContactWatcher {
66
67=== modified file 'src/qml/dialer-app.qml'
68--- src/qml/dialer-app.qml 2014-12-04 13:24:23 +0000
69+++ src/qml/dialer-app.qml 2015-01-21 16:37:32 +0000
70@@ -38,9 +38,10 @@
71 // than one account, otherwise we use always the first one
72 if (multipleAccounts) {
73 return telepathyHelper.defaultCallAccount
74- } else {
75+ } else if (telepathyHelper.activeAccounts.length > 0){
76 return telepathyHelper.activeAccounts[0]
77 }
78+ return null;
79 }
80
81 automaticOrientation: false

Subscribers

People subscribed via source and target branches