aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-09 22:22:54 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-09 22:22:54 +0100
commitc6c9d5d998e63046d25707da573c7ace3a153793 (patch)
tree93880c615ef9debc28d5f0076514350ab87c63fe
parent6109683e3aec0559320eb604bca7b8a809b295fd (diff)
parente441bef2235826e390b9a988eeb34f11c6b74df4 (diff)
downloadayatana-indicator-sound-c6c9d5d998e63046d25707da573c7ace3a153793.tar.gz
ayatana-indicator-sound-c6c9d5d998e63046d25707da573c7ace3a153793.tar.bz2
ayatana-indicator-sound-c6c9d5d998e63046d25707da573c7ace3a153793.zip
Merge branch 'tari01-pr/rename-to-x-lomiri'
Attributes GH PR #62: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/62
-rw-r--r--src/info-notification.vala4
-rw-r--r--src/warn-notification.vala6
-rw-r--r--tests/integration/indicator-sound-test-base.cpp8
-rw-r--r--tests/notifications-test.cc10
4 files changed, 14 insertions, 14 deletions
diff --git a/src/info-notification.vala b/src/info-notification.vala
index c5f8fd8..ce92a2a 100644
--- a/src/info-notification.vala
+++ b/src/info-notification.vala
@@ -43,9 +43,9 @@ public class IndicatorSound.InfoNotification: Notification
var n = _notification;
n.update (_("Volume"), volume_label, icon);
n.clear_hints();
- n.set_hint ("x-ayatana-non-shaped-icon", "true");
+ n.set_hint ("x-lomiri-non-shaped-icon", "true");
n.set_hint ("x-canonical-private-synchronous", "true");
- n.set_hint ("x-ayatana-value-bar-tint", is_high_volume ? "true" : "false");
+ n.set_hint ("x-lomiri-value-bar-tint", is_high_volume ? "true" : "false");
n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100));
show_notification ();
}
diff --git a/src/warn-notification.vala b/src/warn-notification.vala
index 3c473d3..6a08431 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-ayatana-non-shaped-icon", "true");
- n.set_hint ("x-ayatana-snap-decisions", "true");
- n.set_hint ("x-ayatana-private-affirmative-tint", "true");
+ n.set_hint ("x-lomiri-non-shaped-icon", "true");
+ n.set_hint ("x-lomiri-snap-decisions", "true");
+ n.set_hint ("x-lomiri-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 5812a04..45e8acc 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -644,13 +644,13 @@ 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-ayatana-non-shaped-icon"));
- ASSERT_TRUE(hints.contains("x-ayatana-value-bar-tint"));
+ ASSERT_TRUE(hints.contains("x-lomiri-non-shaped-icon"));
+ ASSERT_TRUE(hints.contains("x-lomiri-value-bar-tint"));
ASSERT_TRUE(hints.contains("x-canonical-private-synchronous"));
EXPECT_EQ(volume*100, hints["value"]);
- EXPECT_EQ(true, hints["x-ayatana-non-shaped-icon"]);
- EXPECT_EQ(isLoud, hints["x-ayatana-value-bar-tint"]);
+ EXPECT_EQ(true, hints["x-lomiri-non-shaped-icon"]);
+ EXPECT_EQ(isLoud, hints["x-lomiri-value-bar-tint"]);
EXPECT_EQ(true, hints["x-canonical-private-synchronous"]);
}
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index 47f4c47..4262c09 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -427,7 +427,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) {
ASSERT_EQ(1, notev.size());
EXPECT_EQ("Volume", notev[0].summary);
EXPECT_EQ("Speakers", notev[0].body);
- EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-ayatana-value-bar-tint"]);
+ EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-lomiri-value-bar-tint"]);
/* Set high volume with volume change */
notifications->clearNotifications();
@@ -438,7 +438,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) {
ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */
EXPECT_EQ("Volume", notev[0].summary);
EXPECT_EQ("Speakers", notev[0].body);
- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]);
+ EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-value-bar-tint"]);
/* Move it back */
volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false);
@@ -454,7 +454,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) {
ASSERT_EQ(1, notev.size());
EXPECT_EQ("Volume", notev[0].summary);
EXPECT_EQ("Speakers", notev[0].body);
- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]);
+ EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-value-bar-tint"]);
}
TEST_F(NotificationsTest, DISABLED_MenuHide) {
@@ -621,13 +621,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-ayatana-snap-decisions"]);
+ EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-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-ayatana-snap-decisions"]);
+ EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-lomiri-snap-decisions"]);
EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
}