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

[Gustavo Pichorim Boiko]

Fix a lot of warnings.

Fix a lot of warnings.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/257
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6120
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7372
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7372/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14932
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4510
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4510/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/486/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the MR

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-10-07 17:01:28 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-10-21 19:53:09 +0000
@@ -32,6 +32,7 @@
     objectName: "pageLiveCall"
 
     property var call: callManager.foregroundCall
+    property var calls: callManager.calls
     property string dtmfEntry: ""
     property alias number: contactWatcher.phoneNumber
     property bool onHold: call ? call.held : false
@@ -90,6 +91,7 @@
             return;
         }
         statusLabel.text = text;
+        callConnection.target = null;
         liveCall.call = callObject;
         liveCall.dtmfVisible = false;
         newCallAction.visible = false;
@@ -106,11 +108,21 @@
     }
 
     Connections {
+        id: callConnection
         target: call
         onCallEnded: {
             var callObject = {};
             callObject["elapsedTime"] = call.elapsedTime;
             callObject["active"] = true;
+            callObject["voicemail"] = call.voicemail;
+            callObject["account"] = call.account;
+            callObject["phoneNumber"] = call.phoneNumber;
+            callObject["held"] = call.held;
+            callObject["muted"] = call.muted;
+            callObject["activeAudioOutput"] = call.activeAudioOutput;
+            callObject["audioOutputs"] = call.audioOutputs;
+            callObject["isConference"] = call.isConference;
+
             reportStatus(callObject, i18n.tr("Call ended"));
         }
     }
@@ -456,7 +468,7 @@
         }
 
         width: childrenRect.width
-        height: childrenRect.height
+        height: swapButton.height
         opacity: multiCall && !dtmfVisible ? 1 : 0
         enabled : opacity > 0
         spacing: units.gu(3)

=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
--- src/qml/LiveCallPage/MultiCallDisplay.qml	2014-08-25 23:40:35 +0000
+++ src/qml/LiveCallPage/MultiCallDisplay.qml	2014-10-21 19:53:09 +0000
@@ -45,8 +45,8 @@
 
             height: units.gu(10) + conferenceArea.height
             anchors {
-                left: parent.left
-                right: parent.right
+                left: parent ? parent.left : undefined
+                right: parent ? parent.right : undefined
             }
 
             ContactWatcher {

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-10-06 19:59:17 +0000
+++ src/qml/dialer-app.qml	2014-10-21 19:53:09 +0000
@@ -39,9 +39,10 @@
         // than one account, otherwise we use always the first one
         if (multipleAccounts) {
             return telepathyHelper.defaultCallAccount
-        } else {
+        } else if (telepathyHelper.activeAccounts.length > 0){
             return telepathyHelper.activeAccounts[0]
         }
+        return null;
     }
 
     automaticOrientation: false