Merge lp:~macslow/indicator-datetime/fix-1346925 into lp:indicator-datetime/13.10

[Mirco Müller]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'src/snap.cpp'
--- src/snap.cpp	2014-07-15 19:51:22 +0000
+++ src/snap.cpp	2014-07-22 15:14:13 +0000
@@ -262,6 +262,8 @@
                                          g_variant_new_boolean(true));
             notify_notification_set_hint(m_nn, HINT_TIMEOUT,
                                          g_variant_new_int32(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count()));
+            notify_notification_set_hint(m_nn, HINT_NONSHAPEDICON,
+                                         g_variant_new_boolean(true));
 
             /// alarm popup dialog's button to show the active alarm
             notify_notification_add_action(m_nn, "show", _("Show"),
@@ -374,6 +376,7 @@
     static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"};
     static constexpr char const * HINT_TINT {"x-canonical-private-button-tint"};
     static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
+    static constexpr char const * HINT_NONSHAPEDICON {"x-canonical-non-shaped-icon"};
 };
 
 /**