Merge lp:~mterry/telephony-service/notification-timeout into lp:telephony-service

[Michael Terry]

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for an MMS. This means the screen will only be on 15s instead of 60s.

This is a follow-on from USC adding support for the NOTIFICATION reason [1]. We don't need to bump our dependency version since USC will treat unknown reasons as normal reasons (from my look through the code).

[1] https://code.launchpad.net/~afrantzis/unity-system-compositor/notification-timeouts/+merge/264853

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for an MMS. This means the screen will only be on 15s instead of 60s.

This is a follow-on from USC adding support for the NOTIFICATION reason [1]. We don't need to bump our dependency version since USC will treat unknown reasons as normal reasons (from my look through the code).

[1] https://code.launchpad.net/~afrantzis/unity-system-compositor/notification-timeouts/+merge/264853

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1110
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/521/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/189

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

review: Approve (continuous-integration)

Unmerged revisions

1110. By Michael Terry on 2015-08-06

Use NOTIFICATION reason when turning screen on for an mms or other telepathy message

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2015-06-11 16:38:02 +0000
+++ indicator/textchannelobserver.cpp	2015-08-06 14:04:51 +0000
@@ -406,7 +406,7 @@
                                   QDBusConnection::systemBus());
         QList<QVariant> args;
         args.append("on");
-        args.append(0);
+        args.append(4); // NOTIFICATION
         unityIface.callWithArgumentList(QDBus::NoBlock, "setScreenPowerMode", args);
     }