diff options
| -rw-r--r-- | src/info-notification.vala | 2 | ||||
| -rw-r--r-- | src/warn-notification.vala | 6 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 4 | ||||
| -rw-r--r-- | tests/notifications-test.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/info-notification.vala b/src/info-notification.vala index e093aae..7e7e372 100644 --- a/src/info-notification.vala +++ b/src/info-notification.vala @@ -41,7 +41,7 @@ public class IndicatorSound.InfoNotification: Notification var n = _notification; n.update (_("Volume"), volume_label, icon); n.clear_hints(); - n.set_hint ("x-canonical-non-shaped-icon", "true"); + n.set_hint ("x-ayatana-non-shaped-icon", "true"); n.set_hint ("x-canonical-private-synchronous", "true"); n.set_hint ("x-canonical-value-bar-tint", is_high_volume ? "true" : "false"); n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100)); diff --git a/src/warn-notification.vala b/src/warn-notification.vala index 12e34e4..3c473d3 100644 --- a/src/warn-notification.vala +++ b/src/warn-notification.vala @@ -31,9 +31,9 @@ public class IndicatorSound.WarnNotification: Notification _("Volume"), _("Allow volume above safe level?\nHigh volume can damage your hearing."), "audio-volume-high"); - n.set_hint ("x-canonical-non-shaped-icon", "true"); - n.set_hint ("x-canonical-snap-decisions", "true"); - n.set_hint ("x-canonical-private-affirmative-tint", "true"); + n.set_hint ("x-ayatana-non-shaped-icon", "true"); + n.set_hint ("x-ayatana-snap-decisions", "true"); + n.set_hint ("x-ayatana-private-affirmative-tint", "true"); n.closed.connect ((n) => { n.clear_actions (); }); diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index d30a6f0..f1bc33a 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -641,12 +641,12 @@ void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString cons QVariantMap hints; ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); ASSERT_TRUE(hints.contains("value")); - ASSERT_TRUE(hints.contains("x-canonical-non-shaped-icon")); + ASSERT_TRUE(hints.contains("x-ayatana-non-shaped-icon")); ASSERT_TRUE(hints.contains("x-canonical-value-bar-tint")); ASSERT_TRUE(hints.contains("x-canonical-private-synchronous")); EXPECT_EQ(volume*100, hints["value"]); - EXPECT_EQ(true, hints["x-canonical-non-shaped-icon"]); + EXPECT_EQ(true, hints["x-ayatana-non-shaped-icon"]); EXPECT_EQ(isLoud, hints["x-canonical-value-bar-tint"]); EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); } diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index 60cf00e..1e48f52 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -619,13 +619,13 @@ TEST_F(NotificationsTest, DISABLED_TriggerWarning) { if (warning_expected) { EXPECT_TRUE(volume_warning_get_active(volumeWarning.get())); ASSERT_EQ(1, notev.size()); - EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-snap-decisions"]); + EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-snap-decisions"]); EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-private-synchronous"]); } else { EXPECT_FALSE(volume_warning_get_active(volumeWarning.get())); ASSERT_EQ(1, notev.size()); - EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-snap-decisions"]); + EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-ayatana-snap-decisions"]); EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); } |