Merge lp:~macslow/unity-notifications/fix-1308011 into lp:unity-notifications

[Mirco Müller]

Added close() q_invokable to allow notifications to be closed from the renderer (unity8) side. This facilitates fixing LP:1308011

Added close() q_invokable to allow notifications to be closed from the renderer (unity8) side. This facilitates fixing LP:1308011

- Are there any related MPs required for this MP to build/function as expected?
No

- Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

- Did you make sure that your branch does not contain spurious tags?
Yes

- If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

- If you changed the UI, has there been a design review?
Not applicable

[Michał Sawicz (saviq)]

Looks fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/66/rebuild

review: Approve (continuous-integration)

=== modified file 'include/Notification.h'
--- include/Notification.h	2013-10-18 08:19:39 +0000
+++ include/Notification.h	2014-07-14 14:48:25 +0000
@@ -115,6 +115,7 @@
     void setHints(const QVariantMap& hints);
 
     Q_INVOKABLE void invokeAction(const QString &action);
+    Q_INVOKABLE void close();
 
     bool operator<(const Notification &n) const; // Order by "interestingness".
 };
 
=== modified file 'src/Notification.cpp'
--- src/Notification.cpp	2013-10-18 08:19:39 +0000
+++ src/Notification.cpp	2014-07-14 14:48:25 +0000
@@ -234,3 +234,7 @@
     }
     fprintf(stderr, "Error: tried to invoke action not in actionList.\n");
 }
+
+void Notification::close() {
+    Q_EMIT completed(p->id);
+}