Network Menu

Merge lp:~macslow/indicator-network/fix-1346904 into lp:indicator-network/14.10

  1. fix-1346904
  2. Merge into trunk.14.10
Proposed by Mirco Müller
Status: Merged
Approved by: Charles Kerr
Approved revision: 370
Merged at revision: 376
Proposed branch: lp:~macslow/indicator-network/fix-1346904
Merge into: lp:indicator-network/14.10
Diff against target: 11 lines (+1/-0)
1 file modified
secret-agent/SecretRequest.cpp (+1/-0)
To merge this branch: bzr merge lp:~macslow/indicator-network/fix-1346904
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+227741@code.launchpad.net

Commit message

Make use of the x-canonical-non-shaped-icon hint to suppress masking the symbolic icon with an UbuntuShape.

Description of the change

Make use of the x-canonical-non-shaped-icon hint to suppress masking the symbolic icon with an UbuntuShape.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM, similar to the sibling patch at <lp:~macslow/indicator-datetime/fix-1346925>

review: Approve
Revision history for this message
Mirco Müller (macslow) wrote :

Correct, it's adding the secondary-icon in order to make the notifcation comply with design.

Revision history for this message
Mirco Müller (macslow) wrote :

Doh... I meant the non-shaped-icon hint of course :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'secret-agent/SecretRequest.cpp'
2--- secret-agent/SecretRequest.cpp 2014-05-27 07:44:18 +0000
3+++ secret-agent/SecretRequest.cpp 2014-07-22 13:43:48 +0000
4@@ -40,6 +40,7 @@
5 QVariantMap notificationHints;
6 notificationHints["x-canonical-snap-decisions"] = "true";
7 notificationHints["x-canonical-private-button-tint"] = "true";
8+ notificationHints["x-canonical-non-shaped-icon"] = "true";
9 notificationHints["x-canonical-snap-decisions-timeout"] = std::numeric_limits<std::int32_t>::max();
10
11 QVariantMap menuModelActions;

Subscribers

People subscribed via source and target branches