Merge lp:~larsu/unity-notifications/revert-timeout into lp:unity-notifications

[Lars Karlitski]

Remove timeout hint for snap decisions in favor of the standard timeout parameter

Remove timeout hint for snap decisions in favor of the standard timeout parameter

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

210. By Lars Karlitski on 2014-06-05

Honor expire timeout for snap decisions

Mostly so that providers of snap decisions can set the expire timeout to 0 if
they want the notification to stay on screen until it is interacted with.

The timeouts for other notifications are still decided by the server.

209. By Lars Karlitski on 2014-06-04

Revert r207: add timeout hint for snap decisions

=== modified file 'examples/example.py'
--- examples/example.py	2014-05-07 15:32:40 +0000
+++ examples/example.py	2014-06-05 15:41:13 +0000
@@ -49,7 +49,6 @@
 				'x-canonical-private-icon-only':     False,
 				'x-canonical-truncation':            False,
 				'x-canonical-snap-decisions':        False,
-				'x-canonical-snap-decisions-timeout':False,
 				'x-canonical-switch-to-application': False,
 				'x-canonical-secondary-icon':        False,
 				'x-canonical-private-button-tint':   False,
@@ -108,8 +107,6 @@
 		print "\tx-canonical-truncation"
 	if capabilities['x-canonical-snap-decisions']:
 		print "\tx-canonical-snap-decisions"
-	if capabilities['x-canonical-snap-decisions-timeout']:
-		print "\tx-canonical-snap-decisions-timeout"
 	if capabilities['x-canonical-switch-to-application']:
 		print "\tx-canonical-switch-to-application"
 	if capabilities['x-canonical-secondary-icon']:
 
=== modified file 'examples/sd-example-password-entry.py'
--- examples/sd-example-password-entry.py	2014-05-07 15:32:40 +0000
+++ examples/sd-example-password-entry.py	2014-06-05 15:41:13 +0000
@@ -118,10 +118,9 @@
 	n.set_hint ("x-canonical-private-menu-model", menu_model_paths.end ());
 
 	# indicate to the notification-daemon, that we want to use snap-decisions
-	n.set_hint ("x-canonical-snap-decisions", GLib.Variant.new_string("true"));
-	n.set_hint ("x-canonical-snap-decisions-timeout", GLib.Variant.new_int32(90000));
-	n.set_hint ("x-canonical-private-button-tint", GLib.Variant.new_string("true"));
-	n.set_hint ("x-canonical-non-shaped-icon", GLib.Variant.new_string("true"));
+	n.set_hint_string ("x-canonical-snap-decisions", "true");
+	n.set_hint_string ("x-canonical-private-button-tint", "true");
+	n.set_hint_string ("x-canonical-non-shaped-icon", "true");
 
 	Gio.bus_own_name(Gio.BusType.SESSION, APPLICATION_ID, 0, bus_acquired, None, None)
 
 
=== modified file 'examples/sd-example-user-auth.py'
--- examples/sd-example-user-auth.py	2014-05-07 15:32:40 +0000
+++ examples/sd-example-user-auth.py	2014-06-05 15:41:13 +0000
@@ -132,10 +132,9 @@
 	n.set_hint ("x-canonical-private-menu-model", menu_model_paths.end ());
 
 	# indicate to the notification-daemon, that we want to use snap-decisions
-	n.set_hint ("x-canonical-snap-decisions", GLib.Variant.new_string("true"));
-	n.set_hint ("x-canonical-snap-decisions-timeout", GLib.Variant.new_int32 (90000));
-	n.set_hint ("x-canonical-private-button-tint", GLib.Variant.new_string("true"));
-	n.set_hint ("x-canonical-non-shaped-icon", GLib.Variant.new_string("true")); 
+	n.set_hint_string ("x-canonical-snap-decisions", "true");
+	n.set_hint_string ("x-canonical-private-button-tint", "true");
+	n.set_hint_string ("x-canonical-non-shaped-icon", "true"); 
 
 	Gio.bus_own_name(Gio.BusType.SESSION, APPLICATION_ID, 0, bus_acquired, None, None)
 
 
=== modified file 'include/NotificationServer.h'
--- include/NotificationServer.h	2013-10-18 08:19:39 +0000
+++ include/NotificationServer.h	2014-06-05 15:41:13 +0000
@@ -73,7 +73,7 @@
     void dataChanged(unsigned int id);
 
 private:
-    Notification* buildNotification(NotificationID id, const Hints &hints);
+    Notification* buildNotification(NotificationID id, int expireTimeout, const Hints &hints);
     NotificationModel &model;
     unsigned int idCounter;
 
 
=== modified file 'include/notify-backend.h.in'
--- include/notify-backend.h.in	2014-05-07 15:32:40 +0000
+++ include/notify-backend.h.in	2014-06-05 15:41:13 +0000
@@ -66,6 +66,5 @@
 #define BUTTON_TINT_HINT "x-canonical-private-button-tint"
 #define TRUNCATION_HINT "x-canonical-truncation"
 #define APPEND_HINT "x-canonical-append"
-#define TIMEOUT_HINT "x-canonical-snap-decisions-timeout"
 
 #endif
 
=== modified file 'src/NotificationServer.cpp'
--- src/NotificationServer.cpp	2014-06-02 10:58:21 +0000
+++ src/NotificationServer.cpp	2014-06-05 15:41:13 +0000
@@ -57,13 +57,11 @@
     capabilities.push_back(NON_SHAPED_ICON_HINT);
     capabilities.push_back(MENU_MODEL_HINT);
     capabilities.push_back(INTERACTIVE_HINT);
-    capabilities.push_back(TIMEOUT_HINT);
 
     return capabilities;
 }
 
-Notification* NotificationServer::buildNotification(NotificationID id, const Hints &hints) {
-    int expireTimeout = 0;
+Notification* NotificationServer::buildNotification(NotificationID id, int expireTimeout, const Hints &hints) {
     Notification::Urgency urg = Notification::Urgency::Low;
     if(hints.find(URGENCY_HINT) != hints.end()) {
         QVariant u = hints[URGENCY_HINT].variant();
@@ -74,22 +72,29 @@
         }
     }
     Notification::Type ntype = Notification::Type::Ephemeral;
-    expireTimeout = 5000;
     if(hints.find(SYNCH_HINT) != hints.end()) {
-        expireTimeout = 3000;
         ntype = Notification::Type::Confirmation;
     } else if (hints.find(SNAP_HINT) != hints.end()) {
-        QVariant u = hints[TIMEOUT_HINT].variant();
-        if(!u.canConvert(QVariant::Int)) {
-            expireTimeout = 60000;
-        } else {
-            expireTimeout = u.toInt();
-        }
-
         ntype = Notification::Type::SnapDecision;
     } else if(hints.find(INTERACTIVE_HINT) != hints.end()) {
         ntype = Notification::Type::Interactive;
-        expireTimeout = 5000;
+    }
+
+    switch (ntype) {
+        case Notification::Type::Confirmation:
+            expireTimeout = 3000;
+            break;
+
+        // only snap decisions are allowed to override the timeout
+        case Notification::Type::SnapDecision:
+            if (expireTimeout == -1) {
+                expireTimeout = 60000;
+            }
+            break;
+
+        default:
+            expireTimeout = 5000;
+            break;
     }
 
     Notification* n = new Notification(id, expireTimeout, urg, ntype, this);
@@ -142,7 +147,7 @@
             }
         }
 
-        Notification *n = buildNotification(currentId, hints);
+        Notification *n = buildNotification(currentId, expire_timeout, hints);
         if(!n) {
             fprintf(stderr, "Could not build notification object.\n");
             return FAILURE;