Merge lp:~michael-sheldon/content-hub/fix-notification-icon into lp:content-hub

[Michael Sheldon]

Remove the Ubuntu shape from the save icon in the download snap decision.

Removes the Ubuntu shape from the save icon in the download snap decision.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Yes

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/content-hub-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/179/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good!

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-07-07 12:39:38 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-07-23 11:35:43 +0000
@@ -219,6 +219,9 @@
                                         "x-canonical-snap-decisions",
                                         "true");
 
+    notify_notification_set_hint_string(notification,
+                                        "x-canonical-non-shaped-icon",
+                                        "true");
 
     notify_notification_set_hint_string(notification,
                                         "x-canonical-private-button-tint",