Merge lp:~tiagosh/dialer-app/fix-1512851 into lp:dialer-app

Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 497
Merged at revision: 497
Proposed branch: lp:~tiagosh/dialer-app/fix-1512851
Merge into: lp:dialer-app
Diff against target: 20 lines (+2/-1)
1 file modified
src/qml/DialerPage/DialerPage.qml (+2/-1)
To merge this branch: bzr merge lp:~tiagosh/dialer-app/fix-1512851
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+279159@code.launchpad.net

Commit message

Disable call button while telepathy is not ready.

Description of the change

Disable call button while telepathy is not ready.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/DialerPage/DialerPage.qml'
2--- src/qml/DialerPage/DialerPage.qml 2015-11-13 12:35:53 +0000
3+++ src/qml/DialerPage/DialerPage.qml 2015-12-01 17:37:20 +0000
4@@ -87,7 +87,7 @@
5 // avoid clearing the title when app is inactive
6 // under some states
7 if (!mainView.telepathyReady) {
8- return " "
9+ return i18n.tr("Initializing...")
10 } else if (greeter.greeterActive) {
11 if (mainView.applicationActive) {
12 return i18n.tr("Emergency Calls")
13@@ -412,6 +412,7 @@
14 CallButton {
15 id: callButton
16 objectName: "callButton"
17+ enabled: mainView.telepathyReady
18 anchors {
19 bottom: footer.bottom
20 bottomMargin: units.gu(5)

Subscribers

People subscribed via source and target branches