Merge lp:~macslow/telephony-service/fix-1346838 into lp:telephony-service

[Mirco Müller]

Added the use of the symbolic icon for the incoming-call as the secondary icon as requested by Design.

Added the use of the symbolic icon for the incoming-call as the secondary icon as requested by Design.

For this to work correctly lp:~macslow/unity-notifications/fix-1346394 needs to be merged into lp:unity-notifications trunk first. Without this it will not crash or severely fail otherwise, the secondary icon will just not show up.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:854
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/263/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/79/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/80/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/263/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:854
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~macslow/telephony-service/fix-1346838/+merge/227744/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/telephony-service-ci/264/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/81

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/264/rebuild

review: Needs Fixing (continuous-integration)

[lp:~macslow/telephony-service/fix-1346838]

855. By Mirco Müller on 2014-08-05

Merged with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:855
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/274/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/90/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/91/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/274/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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 changes.

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

Code looks good!

review: Approve

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2014-07-07 19:18:18 +0000
+++ approver/approver.cpp	2014-08-05 13:18:32 +0000
@@ -284,6 +284,9 @@
     notify_notification_set_hint_string(notification,
                                         "x-canonical-private-button-tint",
                                         "true");
+    notify_notification_set_hint_string(notification,
+                                        "x-canonical-secondary-icon",
+                                        "incoming-call");
 
     QString acceptTitle = CallManager::instance()->hasCalls() ? C::gettext("Hold + Answer") :
                                                                 C::gettext("Accept");