Network Menu

Merge lp:~unity-api-team/indicator-network/notify-timeout into lp:~unity-api-team/indicator-network/devel

  1. notify-timeout
  2. Merge into devel
Proposed by Antti Kaijanmäki
Status: Superseded
Proposed branch: lp:~unity-api-team/indicator-network/notify-timeout
Merge into: lp:~unity-api-team/indicator-network/devel
Diff against target: 23 lines (+2/-0)
2 files modified
network/notify-cpp/snapdecision/sim-unlock.cpp (+1/-0)
secret-agent/SecretRequest.cpp (+1/-0)
To merge this branch: bzr merge lp:~unity-api-team/indicator-network/notify-timeout
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+221032@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-02.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Unmerged revisions

336. By Antti Kaijanmäki

use x-canonical-snap-decisions-timeout

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'network/notify-cpp/snapdecision/sim-unlock.cpp'
2--- network/notify-cpp/snapdecision/sim-unlock.cpp 2014-04-24 13:24:05 +0000
3+++ network/notify-cpp/snapdecision/sim-unlock.cpp 2014-05-27 07:54:03 +0000
4@@ -132,6 +132,7 @@
5
6 m_notification = std::make_shared<notify::Notification>(title, body, "");
7 m_notification->setHintString("x-canonical-snap-decisions", "true");
8+ m_notification->setHint("x-canonical-snap-decisions-timeout", TypedVariant<std::int32_t>(std::numeric_limits<std::int32_t>::max()));
9 m_notification->setHint("x-canonical-private-menu-model", TypedVariant<std::map<std::string, Variant>>(modelPaths));
10 m_notification->closed().connect([this](){ m_closed(); });
11
12
13=== modified file 'secret-agent/SecretRequest.cpp'
14--- secret-agent/SecretRequest.cpp 2014-03-28 15:47:23 +0000
15+++ secret-agent/SecretRequest.cpp 2014-05-27 07:54:03 +0000
16@@ -40,6 +40,7 @@
17 QVariantMap notificationHints;
18 notificationHints["x-canonical-snap-decisions"] = "true";
19 notificationHints["x-canonical-private-button-tint"] = "true";
20+ notificationHints["x-canonical-snap-decisions-timeout"] = std::numeric_limits<std::int32_t>::max();
21
22 QVariantMap menuModelActions;
23 menuModelActions["notifications"] = m_menu.actionPath();

Subscribers

People subscribed via source and target branches

to all changes: