diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-10 22:28:58 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-10 22:28:58 +0200 |
| commit | a87dce30629d9bc8d81a0bb0009d0d13b58a5ead (patch) | |
| tree | d2a6f4f2a538b3034171dcdfcaa1ffd836d2dc2b | |
| parent | ef13b2219106edb7783077149cac6d1b816e9bf4 (diff) | |
| parent | acdf1661bd1756f1efac0e5467c5586abedb40d6 (diff) | |
| download | ayatana-indicator-display-a87dce30629d9bc8d81a0bb0009d0d13b58a5ead.tar.gz ayatana-indicator-display-a87dce30629d9bc8d81a0bb0009d0d13b58a5ead.tar.bz2 ayatana-indicator-display-a87dce30629d9bc8d81a0bb0009d0d13b58a5ead.zip | |
Merge branch 'tari01-pr/notification-cleanup'
Attributes GH PR #77: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/77
| -rw-r--r-- | src/usb-snap.cpp | 5 | ||||
| -rw-r--r-- | tests/integration/usb-manager-test.cpp | 7 | ||||
| -rw-r--r-- | tests/unit/usb-snap-test.cpp | 7 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp index 21ca38d..2861166 100644 --- a/src/usb-snap.cpp +++ b/src/usb-snap.cpp @@ -1,5 +1,6 @@ /* * Copyright 2016 Canonical Ltd. + * Copyright 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <src/dbus-names.h> @@ -115,9 +117,6 @@ private: GVariantBuilder hints_builder; g_variant_builder_init(&hints_builder, G_VARIANT_TYPE_VARDICT); - g_variant_builder_add(&hints_builder, "{sv}", "x-lomiri-non-shaped-icon", g_variant_new_string("true")); - g_variant_builder_add(&hints_builder, "{sv}", "x-lomiri-snap-decisions", g_variant_new_string("true")); - g_variant_builder_add(&hints_builder, "{sv}", "x-lomiri-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 6243e92..b693586 100644 --- a/tests/integration/usb-manager-test.cpp +++ b/tests/integration/usb-manager-test.cpp @@ -1,6 +1,6 @@ /* * Copyright 2016 Canonical Ltd. - * Copyright 2022 Robert Tari + * Copyright 2022-2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -132,10 +132,7 @@ TEST_F(UsbManagerFixture, Allow) QVariantMap hints; ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); - ASSERT_EQ(3, hints.size()); - ASSERT_TRUE(hints.contains("x-lomiri-private-affirmative-tint")); - ASSERT_TRUE(hints.contains("x-lomiri-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-lomiri-snap-decisions")); + ASSERT_EQ(0, hints.size()); } notificationsSpy.clear(); diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp index 80b3929..8e42a76 100644 --- a/tests/unit/usb-snap-test.cpp +++ b/tests/unit/usb-snap-test.cpp @@ -1,6 +1,6 @@ /* * Copyright 2016 Canonical Ltd. - * Copyright 2022 Robert Tari + * Copyright 2022-2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -113,10 +113,7 @@ TEST_F(UsbSnapFixture, TestRoundTrip) QVariantMap hints; ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); - ASSERT_EQ(3, hints.size()); - ASSERT_TRUE(hints.contains("x-lomiri-private-affirmative-tint")); - ASSERT_TRUE(hints.contains("x-lomiri-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-lomiri-snap-decisions")); + ASSERT_EQ(0, hints.size()); } notificationsSpy.clear(); |