diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-01 08:17:54 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-01 08:17:54 +0100 |
| commit | f814857699e7903c59a856aaafa4fedecceb8bc5 (patch) | |
| tree | 71c59ca360ea91c707f0370fe6ae8c641e7ae165 | |
| parent | 03d55a301614654bf150f51c0e0c472fef6a904b (diff) | |
| parent | 2cefc0f4f3c12a3956b8e8383ddbc8838d21cff5 (diff) | |
| download | ayatana-indicator-display-f814857699e7903c59a856aaafa4fedecceb8bc5.tar.gz ayatana-indicator-display-f814857699e7903c59a856aaafa4fedecceb8bc5.tar.bz2 ayatana-indicator-display-f814857699e7903c59a856aaafa4fedecceb8bc5.zip | |
Merge branch 'tari01-pr/x-canonical-to-x-ayatana'
Attributes GH PR #35: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/35
| -rw-r--r-- | src/usb-snap.cpp | 6 | ||||
| -rw-r--r-- | tests/integration/usb-manager-test.cpp | 6 | ||||
| -rw-r--r-- | tests/unit/usb-snap-test.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp index 53db6c4..e05062c 100644 --- a/src/usb-snap.cpp +++ b/src/usb-snap.cpp @@ -115,9 +115,9 @@ private: GVariantBuilder hints_builder; g_variant_builder_init(&hints_builder, G_VARIANT_TYPE_VARDICT); - g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-non-shaped-icon", g_variant_new_string("true")); - g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-snap-decisions", g_variant_new_string("true")); - g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-private-affirmative-tint", g_variant_new_string("true")); + g_variant_builder_add(&hints_builder, "{sv}", "x-ayatana-non-shaped-icon", g_variant_new_string("true")); + g_variant_builder_add(&hints_builder, "{sv}", "x-ayatana-snap-decisions", g_variant_new_string("true")); + g_variant_builder_add(&hints_builder, "{sv}", "x-ayatana-private-affirmative-tint", g_variant_new_string("true")); auto args = g_variant_new("(susssasa{sv}i)", "", diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp index c17e587..2f1c51e 100644 --- a/tests/integration/usb-manager-test.cpp +++ b/tests/integration/usb-manager-test.cpp @@ -131,9 +131,9 @@ TEST_F(UsbManagerFixture, Allow) QVariantMap hints; ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); ASSERT_EQ(3, hints.size()); - ASSERT_TRUE(hints.contains("x-canonical-private-affirmative-tint")); - ASSERT_TRUE(hints.contains("x-canonical-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-canonical-snap-decisions")); + ASSERT_TRUE(hints.contains("x-ayatana-private-affirmative-tint")); + ASSERT_TRUE(hints.contains("x-ayatana-non-shaped-icon")); + ASSERT_TRUE(hints.contains("x-ayatana-snap-decisions")); } notificationsSpy.clear(); diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp index 2be4b27..a740265 100644 --- a/tests/unit/usb-snap-test.cpp +++ b/tests/unit/usb-snap-test.cpp @@ -112,9 +112,9 @@ TEST_F(UsbSnapFixture, TestRoundTrip) QVariantMap hints; ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); ASSERT_EQ(3, hints.size()); - ASSERT_TRUE(hints.contains("x-canonical-private-affirmative-tint")); - ASSERT_TRUE(hints.contains("x-canonical-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-canonical-snap-decisions")); + ASSERT_TRUE(hints.contains("x-ayatana-private-affirmative-tint")); + ASSERT_TRUE(hints.contains("x-ayatana-non-shaped-icon")); + ASSERT_TRUE(hints.contains("x-ayatana-snap-decisions")); } notificationsSpy.clear(); |