From acdf1661bd1756f1efac0e5467c5586abedb40d6 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 10 Sep 2023 08:20:11 +0200 Subject: Remove orphan notify-osd remnants --- src/usb-snap.cpp | 5 ++--- tests/integration/usb-manager-test.cpp | 7 ++----- 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 + * Robert Tari */ #include @@ -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(); -- cgit v1.2.3