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

Proposed by Mirco Müller
Status: Merged
Approved by: Michał Sawicz
Approved revision: 213
Merged at revision: 213
Proposed branch: lp:~macslow/unity-notifications/fix-1308011
Merge into: lp:unity-notifications
Diff against target: 23 lines (+5/-0)
2 files modified
include/Notification.h (+1/-0)
src/Notification.cpp (+4/-0)
To merge this branch: bzr merge lp:~macslow/unity-notifications/fix-1308011
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+226683@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Looks fine.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/Notification.h'
2--- include/Notification.h 2013-10-18 08:19:39 +0000
3+++ include/Notification.h 2014-07-14 14:48:25 +0000
4@@ -115,6 +115,7 @@
5 void setHints(const QVariantMap& hints);
6
7 Q_INVOKABLE void invokeAction(const QString &action);
8+ Q_INVOKABLE void close();
9
10 bool operator<(const Notification &n) const; // Order by "interestingness".
11 };
12
13=== modified file 'src/Notification.cpp'
14--- src/Notification.cpp 2013-10-18 08:19:39 +0000
15+++ src/Notification.cpp 2014-07-14 14:48:25 +0000
16@@ -234,3 +234,7 @@
17 }
18 fprintf(stderr, "Error: tried to invoke action not in actionList.\n");
19 }
20+
21+void Notification::close() {
22+ Q_EMIT completed(p->id);
23+}

Subscribers

People subscribed via source and target branches

to all changes: