Merge lp:~larsu/indicator-network/use-standard-timeout into lp:indicator-network/14.10

[Lars Karlitski]

Use standard timeout parameter for snap decisions

Use standard timeout parameter for snap decisions

This can go in after lp:~larsu/unity-notifications/revert-timeout lands.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/139/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

We already have a solution in place.

As per Mircos comment in bug #1295762 there was a technical design decision made with "x-canonical-snap-decisions-timeout". Unless there is a clear technical reason why that solution is wrong I'm not changing the implementation. Sorry.

review: Disapprove

[Charles Kerr (charlesk)]

Marking this as "Rejected" as per Antti's comment from 2014-06-10.

Unmerged revisions

343. By Lars Karlitski on 2014-06-05

Use standard timeout parameter for snap decisions

=== modified file 'network/notify-cpp/notification.cpp'
--- network/notify-cpp/notification.cpp	2014-03-25 23:22:16 +0000
+++ network/notify-cpp/notification.cpp	2014-06-05 15:40:19 +0000
@@ -104,6 +104,12 @@
 }
 
 void
+Notification::setTimeout(int timeout)
+{
+    notify_notification_set_timeout(d->notification.get(), timeout);
+}
+
+void
 Notification::show()
 {
     GError *error = nullptr;

=== modified file 'network/notify-cpp/notification.h'
--- network/notify-cpp/notification.h	2014-05-12 11:36:59 +0000
+++ network/notify-cpp/notification.h	2014-06-05 15:40:19 +0000
@@ -54,6 +54,7 @@
 
     void setHint(const std::string &key, Variant value);
     void setHintString(const std::string &key, const std::string &value);
+    void setTimeout(int timeout);
 
     void show();
     void close();

=== modified file 'network/notify-cpp/snapdecision/sim-unlock.cpp'
--- network/notify-cpp/snapdecision/sim-unlock.cpp	2014-05-27 07:44:18 +0000
+++ network/notify-cpp/snapdecision/sim-unlock.cpp	2014-06-05 15:40:19 +0000
@@ -132,7 +132,7 @@
 
         m_notification = std::make_shared<notify::Notification>(title, body, "");
         m_notification->setHintString("x-canonical-snap-decisions", "true");
-        m_notification->setHint("x-canonical-snap-decisions-timeout", TypedVariant<std::int32_t>(std::numeric_limits<std::int32_t>::max()));
+        m_notification->setTimeout(0);
         m_notification->setHint("x-canonical-private-menu-model", TypedVariant<std::map<std::string, Variant>>(modelPaths));
         m_notification->closed().connect([this](){ m_closed(); });
 

=== modified file 'secret-agent/SecretRequest.cpp'
--- secret-agent/SecretRequest.cpp	2014-05-27 07:44:18 +0000
+++ secret-agent/SecretRequest.cpp	2014-06-05 15:40:19 +0000
@@ -40,7 +40,6 @@
 	QVariantMap notificationHints;
 	notificationHints["x-canonical-snap-decisions"] = "true";
 	notificationHints["x-canonical-private-button-tint"] = "true";
-	notificationHints["x-canonical-snap-decisions-timeout"] = std::numeric_limits<std::int32_t>::max();
 
 	QVariantMap menuModelActions;
 	menuModelActions["notifications"] = m_menu.actionPath();