Merge lp:~michael-sheldon/content-hub/download-manager-with-snapdecision-unity8 into lp:~ken-vandine/content-hub/download-manager-with-snapdecision

[Michael Sheldon]

Make snap decision compatible with unity8

Unity8 no longer displays snap decisions with only one button (by design: bug #1301685), and also doesn't display decisions with NULL text, this branch adds a "Dismiss" option and makes a few small styling changes (highlights the "Open" button and displays the "Save" icon).

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-04-03 19:13:47 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-04-07 10:21:52 +0000
@@ -184,6 +184,14 @@
             && st != cuc::Transfer::aborted);
 }
 
+void action_dismiss(NotifyNotification *notification, char *action, gpointer data)
+{
+    TRACE() << Q_FUNC_INFO;
+    Q_UNUSED(notification);
+    Q_UNUSED(action);
+    Q_UNUSED(data);
+}
+
 void action_accept(NotifyNotification *notification, char *action, gpointer data)
 {
     TRACE() << Q_FUNC_INFO;
@@ -201,13 +209,18 @@
     NotifyNotification* notification;
 
     notification = notify_notification_new ("Download Complete",
-                                            NULL,
-                                            NULL);
+                                            "",
+                                            "save");
+
     notify_notification_set_hint_string(notification,
                                         "x-canonical-snap-decisions",
                                         "true");
 
 
+    notify_notification_set_hint_string(notification,
+                                        "x-canonical-private-button-tint",
+                                        "true");
+
     notify_notification_add_action (notification,
                                     "action_accept",
                                     "Open",
@@ -215,6 +228,13 @@
                                     t,
                                     NULL);
 
+    notify_notification_add_action (notification,
+                                    "action_dismiss",
+                                    "Dismiss",
+                                    action_dismiss,
+                                    t,
+                                    NULL);
+
     GError *error = NULL;
     if (!notify_notification_show(notification, &error)) {
         qWarning() << "Failed to show snap decision:" << error->message;