From a7066eafeaee686ed3f8c2a13d254a9d21efe4f7 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 4 Nov 2021 17:05:51 +0100 Subject: Fix ambiguous language code fixes https://github.com/AyatanaIndicators/ayatana-indicator-sound/issues/50 --- po/LINGUAS | 1 - po/ku.po | 280 ------------------------------------------------------------- 2 files changed, 281 deletions(-) delete mode 100644 po/ku.po diff --git a/po/LINGUAS b/po/LINGUAS index dfafc6f..5a4bd9c 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -59,7 +59,6 @@ kl km kn ko -ku kw ky la diff --git a/po/ku.po b/po/ku.po deleted file mode 100644 index 95e808f..0000000 --- a/po/ku.po +++ /dev/null @@ -1,280 +0,0 @@ -# Kurdish translations for PACKAGE package. -# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2017. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-12 07:22+0200\n" -"PO-Revision-Date: 2017-10-12 07:52+0200\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: ku\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../data/org.ayatana.indicator.sound.AccountsService.policy:5 -msgid "Set properties of own user" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.AccountsService.policy:6 -msgid "Authentication is required to set one's own indicator sound properties." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.AccountsService.policy:15 -msgid "Set properties of any user" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.AccountsService.policy:16 -msgid "" -"Authentication is required to set another user's indicator sound properties." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:1 -msgid "A list of applications blacklisted from the sound menu" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:2 -msgid "" -"Each media player which abides by the MPRIS2 spec will automatically appear " -"in the menu. This array should contain the desktop file names (minus ." -"desktop suffix) of applications which do not want to be included in the " -"sound menu." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:3 -msgid "" -"A list of applications which at some point have registered with the sound " -"menu" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:4 -msgid "" -"Each media player which abides by the MPRIS2 spec will automatically appear " -"in the menu. This array should contain the desktop file names (minus ." -"desktop suffix) of applications which have at some point appeared in the " -"menu. This allows the menu remember and display offlined applications." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:5 -msgid "" -"A list of applications that will have player controls visible all the time" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:6 -msgid "Initial setting for global mute (mute all) on the menu" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:7 -msgid "On start up volume should not be muted." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:9 -#, no-c-format -msgid "Whether the volume slider allows setting the volume above 100%" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:10 -msgid "Whether or not to show the sound indicator in the menu bar." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:11 -msgid "Whether or not to show high volume warnings." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:12 -msgid "" -"If enabled on a device, a confirmation dialog will be presented to the user " -"if (a) something is plugged into the headphone jack (ie, no warnings for " -"speaker volumes) AND (b) media is playing (ie, no warnings for ringtone " -"volumes) AND (c) the user attempts to set the volume higher than warning-" -"volume-decibels AND (d) the user has not indicated approval in the last " -"warning-volume-approval-ttl seconds." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:13 -msgid "How many seconds a user's warning-volume approval should be remembered." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:14 -msgid "" -"How long to remember a user's approval of the confirmation dialog discussed " -"in the description of 'warning-volume-enabled'.\n" -"\n" -"The default value (72,000 seconds) corresponds to the 20 hours suggested by " -"EU standard EN 60950-1/Al2: “The acknowledgement does not need to be " -"repeated more than once every 20 h of cumulative listening time.”" -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:17 -msgid "Volume level that triggers a high volume warning." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:18 -msgid "" -"Volume level that triggers a high volume warning. See warning-volume-enabled " -"for details." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:19 -msgid "Normal output volume." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:20 -msgid "" -"The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting " -"is disabled.\n" -"\n" -"To conform with EU standard EN 60950-1/Al2, this value should never be set " -"to a dB that causes headphone sound output to exceed 100 dBA, nor electric " -"output to exceed 150 mV.\n" -"\n" -"The default value (0) corresponds to PulseAudio's PA_VOLUME_NORM." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:25 -msgid "" -"Output volume to use when com.ubuntu.sound's 'allow-amplified-volume' " -"setting is enabled." -msgstr "" - -#: ../data/org.ayatana.indicator.sound.gschema.xml:26 -msgid "" -"The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting " -"is enabled.\n" -"\n" -"To conform with EU standard EN 60950-1/Al2, this value should never be set " -"to a dB that causes headphone sound output to exceed 100 dBA, nor electric " -"output to exceed 150 mV.\n" -"\n" -"The default value (11) corresponds to PulseAudio's PA_VOLUME_UI_MAX." -msgstr "" - -#: ../src/info-notification.vala:25 ../src/info-notification.vala:42 -#: ../src/service.vala:331 ../src/service.vala:334 ../src/sound-menu.vala:59 -#: ../src/sound-menu.vala:253 ../src/warn-notification.vala:31 -msgid "Volume" -msgstr "" - -#: ../src/info-notification.vala:55 -msgid "Speakers" -msgstr "" - -#: ../src/info-notification.vala:57 -msgid "Headphones" -msgstr "" - -#: ../src/info-notification.vala:59 -msgid "Bluetooth headphones" -msgstr "" - -#: ../src/info-notification.vala:61 -msgid "Bluetooth speaker" -msgstr "" - -#: ../src/info-notification.vala:63 -msgid "Usb speaker" -msgstr "" - -#: ../src/info-notification.vala:65 -msgid "Usb headphones" -msgstr "" - -#: ../src/info-notification.vala:67 -msgid "HDMI speaker" -msgstr "" - -#: ../src/info-notification.vala:69 -msgid "HDMI headphones" -msgstr "" - -#: ../src/service.vala:295 -msgid "Missing application" -msgstr "" - -#: ../src/service.vala:295 -#, c-format -msgid "Could not find the '%s' application - please make sure it is installed." -msgstr "" - -#: ../src/service.vala:328 -msgid "Volume (muted)" -msgstr "" - -#: ../src/service.vala:331 -msgid "silent" -msgstr "" - -#: ../src/service.vala:339 -msgid "Sound" -msgstr "" - -#: ../src/sound-menu.vala:52 -msgid "Mute" -msgstr "" - -#: ../src/sound-menu.vala:54 -msgid "Silent Mode" -msgstr "" - -#: ../src/sound-menu.vala:68 -msgid "Sound Settings…" -msgstr "" - -#: ../src/sound-menu.vala:125 -msgid "Microphone Volume" -msgstr "" - -#. NOTE: Action doesn't really exist, just used to find below when removing -#: ../src/sound-menu.vala:148 -msgid "High volume can damage your hearing." -msgstr "" - -#: ../src/sound-menu.vala:256 -msgid "Volume (Headphones)" -msgstr "" - -#: ../src/sound-menu.vala:259 -msgid "Volume (Bluetooth)" -msgstr "" - -#: ../src/sound-menu.vala:262 -msgid "Volume (Usb)" -msgstr "" - -#: ../src/sound-menu.vala:265 -msgid "Volume (HDMI)" -msgstr "" - -#: ../src/sound-menu.vala:268 -msgid "Volume (Bluetooth headphones)" -msgstr "" - -#: ../src/sound-menu.vala:271 -msgid "Volume (Usb headphones)" -msgstr "" - -#: ../src/sound-menu.vala:274 -msgid "Volume (HDMI headphones)" -msgstr "" - -#: ../src/sound-menu.vala:449 -msgid "Choose Playlist" -msgstr "" - -#: ../src/warn-notification.vala:32 -msgid "" -"Allow volume above safe level?\n" -"High volume can damage your hearing." -msgstr "" - -#: ../src/warn-notification.vala:49 -msgid "OK" -msgstr "" - -#: ../src/warn-notification.vala:52 -msgid "Cancel" -msgstr "" -- cgit v1.2.3 From e99439d16902e186142a3a21286c38544d481344 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 19:44:36 +0100 Subject: src/media-player-user.vala: Rename unity-greeter-session-broadcast --- src/media-player-user.vala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/media-player-user.vala b/src/media-player-user.vala index 64e9bd5..d4bf921 100644 --- a/src/media-player-user.vala +++ b/src/media-player-user.vala @@ -230,7 +230,7 @@ public class MediaPlayerUser : MediaPlayer { } } - /* Control functions through unity-greeter-session-broadcast */ + /* Control functions through ayatana-greeter-session-broadcast */ public override void activate () { /* TODO: */ } @@ -251,7 +251,7 @@ public class MediaPlayerUser : MediaPlayer { } }); } else { - warning("No unity-greeter-session-broadcast to send play-pause"); + warning("No ayatana-greeter-session-broadcast to send play-pause"); } } public override void next () { @@ -271,7 +271,7 @@ public class MediaPlayerUser : MediaPlayer { } }); } else { - warning("No unity-greeter-session-broadcast to send next"); + warning("No ayatana-greeter-session-broadcast to send next"); } } public override void previous () { @@ -291,7 +291,7 @@ public class MediaPlayerUser : MediaPlayer { } }); } else { - warning("No unity-greeter-session-broadcast to send previous"); + warning("No ayatana-greeter-session-broadcast to send previous"); } } -- cgit v1.2.3 From 99e774d52a1095df0415b0906a9622f3ff9e9229 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 20:07:08 +0100 Subject: Rename x-canonical-value-bar-tint --- src/info-notification.vala | 4 +++- tests/integration/indicator-sound-test-base.cpp | 9 ++++++--- tests/notifications-test.cc | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/info-notification.vala b/src/info-notification.vala index 7e7e372..c5f8fd8 100644 --- a/src/info-notification.vala +++ b/src/info-notification.vala @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ using Notify; @@ -43,7 +45,7 @@ public class IndicatorSound.InfoNotification: Notification n.clear_hints(); 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 ("x-ayatana-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/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index f1bc33a..b92cc9f 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Canonical, Ltd. + * Copyright (C) 2021 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 @@ -13,7 +14,9 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . * - * Author: Xavi Garcia + * Authors: + * Xavi Garcia + * Robert Tari */ #include "indicator-sound-test-base.h" @@ -642,12 +645,12 @@ void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString cons 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-canonical-value-bar-tint")); + ASSERT_TRUE(hints.contains("x-ayatana-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-canonical-value-bar-tint"]); + EXPECT_EQ(isLoud, hints["x-ayatana-value-bar-tint"]); EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); } diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index 1e48f52..47f4c47 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -1,5 +1,6 @@ /* * Copyright © 2015-2016 Canonical Ltd. + * Copyright © 2021 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +17,7 @@ * Authors: * Ted Gould * Charles Kerr + * Robert Tari */ #include @@ -425,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-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-ayatana-value-bar-tint"]); /* Set high volume with volume change */ notifications->clearNotifications(); @@ -436,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-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]); /* Move it back */ volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false); @@ -452,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-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]); } TEST_F(NotificationsTest, DISABLED_MenuHide) { -- cgit v1.2.3 From f4410e0dcde4b9e177dbe4620edd99a11abed963 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 20:46:46 +0100 Subject: Rename UNITY_API* --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/gmenuharness/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67aa92d..3038762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ pkg_check_modules( ) include_directories(${SOUNDSERVICE_INCLUDE_DIRS}) -pkg_check_modules(UNITY_API liblomiri-api>=0.1.1) +pkg_check_modules(LOMIRI_API liblomiri-api>=0.1.1) include_directories(${TEST_INCLUDE_DIRS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f886f81..6706222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -313,7 +313,7 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-sound/ ) -if(UNITY_API_FOUND) +if(LOMIRI_API_FOUND) add_subdirectory(gmenuharness) endif() diff --git a/src/gmenuharness/CMakeLists.txt b/src/gmenuharness/CMakeLists.txt index 761949b..71d060d 100644 --- a/src/gmenuharness/CMakeLists.txt +++ b/src/gmenuharness/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${UNITY_API_INCLUDE_DIRS}) +include_directories(${LOMIRI_API_INCLUDE_DIRS}) include_directories("${CMAKE_SOURCE_DIR}/include") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b1142f9..10c3cf5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -325,7 +325,7 @@ add_test(indicator-test indicator-test ) -if(UNITY_API_FOUND) +if(LOMIRI_API_FOUND) add_subdirectory(integration) endif() add_subdirectory(dbus-types) -- cgit v1.2.3 From 8c5fe3a1479e96c70499c392194f1c2f90ff616f Mon Sep 17 00:00:00 2001 From: Michele Date: Thu, 4 Nov 2021 19:41:15 +0000 Subject: Translated using Weblate (Italian) Currently translated at 88.6% (47 of 53 strings) Translation: Ayatana Indicators/Sound Applet Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/sound-applet/it/ --- po/it.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/po/it.po b/po/it.po index d0e5116..d1b42d6 100644 --- a/po/it.po +++ b/po/it.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-08-12 07:21+0200\n" -"PO-Revision-Date: 2020-10-26 13:13+0000\n" +"PO-Revision-Date: 2021-11-07 16:53+0000\n" "Last-Translator: Michele \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.3.2-dev\n" +"X-Generator: Weblate 4.9-dev\n" #: ../data/org.ayatana.indicator.sound.AccountsService.policy:5 msgid "Set properties of own user" @@ -51,8 +51,8 @@ msgid "" "desktop suffix) of applications which do not want to be included in the " "sound menu." msgstr "" -"Ogni media player controllato da MPRIS2 spec apparirà automaticamente nel " -"menu. Questo vettore dovrà contenere i nomi dei file del Desktop (senza il " +"Ogni media player controllato da MPRIS2 spec apparirà automaticamente nel " +"menu. Questo vettore dovrà contenere i nomi dei file del Desktop (senza il " "suffisso .desktop) delle applicazioni che non si vuole incluse nel menu " "audio." @@ -239,7 +239,7 @@ msgstr "Suono" #: ../src/sound-menu.vala:52 msgid "Mute" -msgstr "Mute" +msgstr "Muto" #: ../src/sound-menu.vala:54 msgid "Silent Mode" @@ -268,7 +268,7 @@ msgstr "Volume (Bluetooth)" #: ../src/sound-menu.vala:262 msgid "Volume (Usb)" -msgstr "Volume (Usb)" +msgstr "Volume (USB)" #: ../src/sound-menu.vala:265 msgid "Volume (HDMI)" @@ -291,11 +291,12 @@ msgid "Choose Playlist" msgstr "Scegli Playlist" #: ../src/warn-notification.vala:32 -#, fuzzy msgid "" "Allow volume above safe level?\n" "High volume can damage your hearing." -msgstr "Il volume alto danneggia l'udito." +msgstr "" +"Permettere il volume sopra i livelli di sicurezza?\n" +"Il volume alto può danneggiare l'udito." #: ../src/warn-notification.vala:49 msgid "OK" -- cgit v1.2.3 From f8b599631a55b6a71366313876257b9aaecd48ab Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Fri, 5 Nov 2021 08:33:24 +0000 Subject: Translated using Weblate (Slovak) Currently translated at 79.2% (42 of 53 strings) Translation: Ayatana Indicators/Sound Applet Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/sound-applet/sk/ --- po/sk.po | 93 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/po/sk.po b/po/sk.po index effda27..0f72933 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-08-12 07:22+0200\n" -"PO-Revision-Date: 2020-05-31 23:41+0000\n" -"Last-Translator: Juraj Liso \n" -"Language-Team: Slovak \n" +"PO-Revision-Date: 2021-11-07 16:53+0000\n" +"Last-Translator: Andrej Shadura \n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.1-dev\n" +"X-Generator: Weblate 4.9-dev\n" #: ../data/org.ayatana.indicator.sound.AccountsService.policy:5 msgid "Set properties of own user" @@ -25,7 +25,7 @@ msgstr "" #: ../data/org.ayatana.indicator.sound.AccountsService.policy:6 msgid "Authentication is required to set one's own indicator sound properties." -msgstr "" +msgstr "Pre nastavenie vlastností indikátora zvuku je potrebné overenie." #: ../data/org.ayatana.indicator.sound.AccountsService.policy:15 msgid "Set properties of any user" @@ -35,10 +35,12 @@ msgstr "" msgid "" "Authentication is required to set another user's indicator sound properties." msgstr "" +"Pre nastavenie vlastností indikátora zvuku iného používateľa je potrebné " +"overenie." #: ../data/org.ayatana.indicator.sound.gschema.xml:1 msgid "A list of applications blacklisted from the sound menu" -msgstr "" +msgstr "Zoznam aplikácií vylúčených z menu zvuku" #: ../data/org.ayatana.indicator.sound.gschema.xml:2 msgid "" @@ -47,12 +49,15 @@ msgid "" "desktop suffix) of applications which do not want to be included in the " "sound menu." msgstr "" +"Každý prehrávač médií, ktorý dodržiava špecifikáciu MPRIS2, sa automaticky " +"zobrazí v menu. Toto pole by malo obsahovať názvy desktop súborov (bez " +"prípony .desktop) aplikácií, ktoré nechcete, aby boli zahrnuté do menu zvuku." #: ../data/org.ayatana.indicator.sound.gschema.xml:3 msgid "" "A list of applications which at some point have registered with the sound " "menu" -msgstr "" +msgstr "Zoznam aplikácií, ktoré sa niekedy zaregistrovali v menu zvuku" #: ../data/org.ayatana.indicator.sound.gschema.xml:4 msgid "" @@ -65,28 +70,28 @@ msgstr "" #: ../data/org.ayatana.indicator.sound.gschema.xml:5 msgid "" "A list of applications that will have player controls visible all the time" -msgstr "" +msgstr "Zoznam aplikácií, ktoré budú mať stále viditeľné ovládanie prehrávania" #: ../data/org.ayatana.indicator.sound.gschema.xml:6 msgid "Initial setting for global mute (mute all) on the menu" -msgstr "" +msgstr "Počiatočné nastavenie globálneho stlmenia (stlmiť všetko) v menu" #: ../data/org.ayatana.indicator.sound.gschema.xml:7 msgid "On start up volume should not be muted." -msgstr "" +msgstr "Pri spustení by sa hlasitosť nemala stlmiť." #: ../data/org.ayatana.indicator.sound.gschema.xml:9 #, no-c-format msgid "Whether the volume slider allows setting the volume above 100%" -msgstr "" +msgstr "Či ovládač hlasitosti umožňuje nastaviť hlasitosť nad 100 %" #: ../data/org.ayatana.indicator.sound.gschema.xml:10 msgid "Whether or not to show the sound indicator in the menu bar." -msgstr "" +msgstr "Či sa má alebo nemá zobraziť zvukový indikátor na paneli menu." #: ../data/org.ayatana.indicator.sound.gschema.xml:11 msgid "Whether or not to show high volume warnings." -msgstr "" +msgstr "Či sa majú alebo nemajú zobrazovať upozornenia na vysokú hlasitosť." #: ../data/org.ayatana.indicator.sound.gschema.xml:12 msgid "" @@ -114,7 +119,7 @@ msgstr "" #: ../data/org.ayatana.indicator.sound.gschema.xml:17 msgid "Volume level that triggers a high volume warning." -msgstr "" +msgstr "Úroveň hlasitosti, ktorá spustí upozornenie na vysokú hlasitosť." #: ../data/org.ayatana.indicator.sound.gschema.xml:18 msgid "" @@ -124,7 +129,7 @@ msgstr "" #: ../data/org.ayatana.indicator.sound.gschema.xml:19 msgid "Normal output volume." -msgstr "" +msgstr "Normálna výstupná hlasitosť." #: ../data/org.ayatana.indicator.sound.gschema.xml:20 msgid "" @@ -160,60 +165,60 @@ msgstr "" #: ../src/service.vala:331 ../src/service.vala:334 ../src/sound-menu.vala:59 #: ../src/sound-menu.vala:253 ../src/warn-notification.vala:31 msgid "Volume" -msgstr "" +msgstr "Hlasitosť" #: ../src/info-notification.vala:55 msgid "Speakers" -msgstr "" +msgstr "Reproduktory" #: ../src/info-notification.vala:57 msgid "Headphones" -msgstr "" +msgstr "Slúchadlá" #: ../src/info-notification.vala:59 msgid "Bluetooth headphones" -msgstr "" +msgstr "Bluetooth slúchadlá" #: ../src/info-notification.vala:61 msgid "Bluetooth speaker" -msgstr "" +msgstr "Bluetooth reproduktor" #: ../src/info-notification.vala:63 msgid "Usb speaker" -msgstr "" +msgstr "USB reproduktor" #: ../src/info-notification.vala:65 msgid "Usb headphones" -msgstr "" +msgstr "USB slúchadlá" #: ../src/info-notification.vala:67 msgid "HDMI speaker" -msgstr "" +msgstr "HDMI reproduktor" #: ../src/info-notification.vala:69 msgid "HDMI headphones" -msgstr "" +msgstr "HDMI slúchadlá" #: ../src/service.vala:295 msgid "Missing application" -msgstr "" +msgstr "Chýba aplikácia" #: ../src/service.vala:295 #, c-format msgid "Could not find the '%s' application - please make sure it is installed." -msgstr "" +msgstr "Nepodarilo sa nájsť aplikáciu „%s“. Skontrolujte, či je nainštalovaná." #: ../src/service.vala:328 msgid "Volume (muted)" -msgstr "" +msgstr "Hlasitosť (stlmená)" #: ../src/service.vala:331 msgid "silent" -msgstr "" +msgstr "ticho" #: ../src/service.vala:339 msgid "Sound" -msgstr "" +msgstr "Zvuk" #: ../src/sound-menu.vala:52 msgid "Mute" @@ -221,58 +226,60 @@ msgstr "" #: ../src/sound-menu.vala:54 msgid "Silent Mode" -msgstr "" +msgstr "Tichý režim" #: ../src/sound-menu.vala:68 msgid "Sound Settings…" -msgstr "" +msgstr "Nastavenia zvuku…" #: ../src/sound-menu.vala:125 msgid "Microphone Volume" -msgstr "" +msgstr "Hlasitosť mikrofónu" #. NOTE: Action doesn't really exist, just used to find below when removing #: ../src/sound-menu.vala:148 msgid "High volume can damage your hearing." -msgstr "" +msgstr "Vysoká hlasitosť môže poškodiť váš sluch." #: ../src/sound-menu.vala:256 msgid "Volume (Headphones)" -msgstr "" +msgstr "Hlasitosť (slúchadlá)" #: ../src/sound-menu.vala:259 msgid "Volume (Bluetooth)" -msgstr "" +msgstr "Hlasitosť (Bluetooth)" #: ../src/sound-menu.vala:262 msgid "Volume (Usb)" -msgstr "" +msgstr "Hlasitosť (USB)" #: ../src/sound-menu.vala:265 msgid "Volume (HDMI)" -msgstr "" +msgstr "Hlasitosť (HDMI)" #: ../src/sound-menu.vala:268 msgid "Volume (Bluetooth headphones)" -msgstr "" +msgstr "Hlasitosť (Bluetooth slúchadlá)" #: ../src/sound-menu.vala:271 msgid "Volume (Usb headphones)" -msgstr "" +msgstr "Hlasitosť (USB slúchadlá)" #: ../src/sound-menu.vala:274 msgid "Volume (HDMI headphones)" -msgstr "" +msgstr "Hlasitosť (HDMI slúchadlá)" #: ../src/sound-menu.vala:449 msgid "Choose Playlist" -msgstr "" +msgstr "Zvoľte zoznam skladieb" #: ../src/warn-notification.vala:32 msgid "" "Allow volume above safe level?\n" "High volume can damage your hearing." msgstr "" +"Povolená hlasitosť nad bezpečnú úroveň?\n" +"Vysoká hlasitosť môže poškodiť váš sluch." #: ../src/warn-notification.vala:49 msgid "OK" @@ -280,4 +287,4 @@ msgstr "OK" #: ../src/warn-notification.vala:52 msgid "Cancel" -msgstr "" +msgstr "Zrušiť" -- cgit v1.2.3 From 98af840c2161da2a61f7ac1f6f39bcb8ff0d61c1 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:02:56 +0100 Subject: Whitespace fix --- src/options-gsettings.vala | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala index 556bbc6..7c187f9 100644 --- a/src/options-gsettings.vala +++ b/src/options-gsettings.vala @@ -22,13 +22,13 @@ using PulseAudio; public class IndicatorSound.OptionsGSettings : Options { - public OptionsGSettings() { - init_max_volume(); - init_loud_volume(); - } + public OptionsGSettings() { + init_max_volume(); + init_loud_volume(); + } - ~OptionsGSettings() { - } + ~OptionsGSettings() { + } private Settings _settings = new Settings ("org.ayatana.indicator.sound"); #if HAS_UBUNTU_SOUND_SCHEMA @@ -38,9 +38,9 @@ public class IndicatorSound.OptionsGSettings : Options #endif /** MAX VOLUME PROPERTY **/ - private const string AMP_dB_KEY = "amplified-volume-decibels"; - private const string NORMAL_dB_KEY = "normal-volume-decibels"; - private const string ALLOW_AMP_KEY = "allow-amplified-volume"; + private const string AMP_dB_KEY = "amplified-volume-decibels"; + private const string NORMAL_dB_KEY = "normal-volume-decibels"; + private const string ALLOW_AMP_KEY = "allow-amplified-volume"; private void init_max_volume() { _settings.changed[NORMAL_dB_KEY].connect(() => update_max_volume()); @@ -67,24 +67,24 @@ public class IndicatorSound.OptionsGSettings : Options } - /** LOUD VOLUME **/ + /** LOUD VOLUME **/ - private const string LOUD_ENABLED_KEY = "warning-volume-enabled"; - private const string LOUD_DECIBEL_KEY = "warning-volume-decibels"; + private const string LOUD_ENABLED_KEY = "warning-volume-enabled"; + private const string LOUD_DECIBEL_KEY = "warning-volume-decibels"; private void init_loud_volume() { _settings.changed[LOUD_ENABLED_KEY].connect(() => update_loud_volume()); _settings.changed[LOUD_DECIBEL_KEY].connect(() => update_loud_volume()); - update_loud_volume(); - } - private void update_loud_volume() { + update_loud_volume(); + } + private void update_loud_volume() { - var vol = PulseAudio.Volume.sw_from_dB (_settings.get_double (LOUD_DECIBEL_KEY)); - if (loud_volume != vol) - loud_volume = vol; + var vol = PulseAudio.Volume.sw_from_dB (_settings.get_double (LOUD_DECIBEL_KEY)); + if (loud_volume != vol) + loud_volume = vol; - var enabled = _settings.get_boolean(LOUD_ENABLED_KEY); - if (loud_warning_enabled != enabled) - loud_warning_enabled = enabled; + var enabled = _settings.get_boolean(LOUD_ENABLED_KEY); + if (loud_warning_enabled != enabled) + loud_warning_enabled = enabled; } } -- cgit v1.2.3 From f895b91a6f75d37d67e9e4dc946b0a954384d1d0 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:04:41 +0100 Subject: Rename com.ubuntu.sound --- data/CMakeLists.txt | 2 +- data/org.ayatana.indicator.sound.gschema.xml | 6 +++--- src/CMakeLists.txt | 2 +- src/options-gsettings.vala | 2 +- tests/CMakeLists.txt | 4 ++-- tests/integration/indicator-sound-test-base.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index e9ed905..0e30f7c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -66,7 +66,7 @@ install( add_schema ("org.ayatana.indicator.sound.gschema.xml") -if(NOT EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml) +if(NOT EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml) add_schema ("org.ayatana.sound.gschema.xml") endif() diff --git a/data/org.ayatana.indicator.sound.gschema.xml b/data/org.ayatana.indicator.sound.gschema.xml index de9c8b9..b94213c 100644 --- a/data/org.ayatana.indicator.sound.gschema.xml +++ b/data/org.ayatana.indicator.sound.gschema.xml @@ -82,7 +82,7 @@ 0 Normal output volume. - The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is disabled. + The maximum volume when com.lomiri.sound's 'allow-amplified-volume' setting is disabled. To conform with EU standard EN 60950-1/Al2, this value should never be set to a dB that causes headphone sound output to exceed 100 dBA, nor @@ -94,9 +94,9 @@ 11 - Output volume to use when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled. + Output volume to use when com.lomiri.sound's 'allow-amplified-volume' setting is enabled. - The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled. + The maximum volume when com.lomiri.sound's 'allow-amplified-volume' setting is enabled. To conform with EU standard EN 60950-1/Al2, this value should never be set to a dB that causes headphone sound output to exceed 100 dBA, nor diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6706222..13576f1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.h") set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") -if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml") +if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml") set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA") endif() diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala index 7c187f9..5284011 100644 --- a/src/options-gsettings.vala +++ b/src/options-gsettings.vala @@ -32,7 +32,7 @@ public class IndicatorSound.OptionsGSettings : Options private Settings _settings = new Settings ("org.ayatana.indicator.sound"); #if HAS_UBUNTU_SOUND_SCHEMA - private Settings _shared_settings = new Settings ("com.ubuntu.sound"); + private Settings _shared_settings = new Settings ("com.lomiri.sound"); #else private Settings _shared_settings = new Settings ("org.ayatana.sound"); #endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 10c3cf5..9a80bdd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -33,8 +33,8 @@ add_custom_target ( # and help the tests to find that file by setting -DSCHEMA_DIR set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas") -if (EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml) - set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml) +if (EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml) + set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml) add_definitions ( -DHAS_UBUNTU_SOUND_SCHEMA ) else() set (SOUND_SCHEMA ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml) diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index b92cc9f..869139b 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -184,7 +184,7 @@ bool IndicatorSoundTestBase::resetAllowAmplifiedVolume() proc.start("gsettings", QStringList() << "reset" #ifdef HAS_UBUNTU_SOUND_SCHEMA - << "com.ubuntu.sound" + << "com.lomiri.sound" #else << "org.ayatana.sound" #endif -- cgit v1.2.3 From eb1f2fb365bd5e850e49c2d989a85d9a7b8531fe Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:08:34 +0100 Subject: Rename VALA_DEFINE_UBUNTU_SOUND_SCHEMA --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13576f1..2c04550 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml") - set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA") + set (VALA_DEFINE_LOMIRI_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA") endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml") @@ -59,7 +59,7 @@ vala_init(ayatana-indicator-sound-service --vapidir=${CMAKE_SOURCE_DIR}/vapi/ --vapidir=. --pkg=bus-watcher - ${VALA_DEFINE_UBUNTU_SOUND_SCHEMA} + ${VALA_DEFINE_LOMIRI_SOUND_SCHEMA} ${VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS} ${VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS} ${VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS} -- cgit v1.2.3 From 64cb8b30764718a2a4f5b5a077b3a8686bbd7329 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:10:43 +0100 Subject: Rename HAS_UBUNTU_SOUND_SCHEMA --- src/CMakeLists.txt | 2 +- src/options-gsettings.vala | 2 +- tests/CMakeLists.txt | 2 +- tests/integration/indicator-sound-test-base.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c04550..761e87b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml") - set (VALA_DEFINE_LOMIRI_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA") + set (VALA_DEFINE_LOMIRI_SOUND_SCHEMA "--define=HAS_LOMIRI_SOUND_SCHEMA") endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml") diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala index 5284011..5691a17 100644 --- a/src/options-gsettings.vala +++ b/src/options-gsettings.vala @@ -31,7 +31,7 @@ public class IndicatorSound.OptionsGSettings : Options } private Settings _settings = new Settings ("org.ayatana.indicator.sound"); -#if HAS_UBUNTU_SOUND_SCHEMA +#if HAS_LOMIRI_SOUND_SCHEMA private Settings _shared_settings = new Settings ("com.lomiri.sound"); #else private Settings _shared_settings = new Settings ("org.ayatana.sound"); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9a80bdd..75dab34 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,7 +35,7 @@ set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas") if (EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml) set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml) - add_definitions ( -DHAS_UBUNTU_SOUND_SCHEMA ) + add_definitions ( -DHAS_LOMIRI_SOUND_SCHEMA ) else() set (SOUND_SCHEMA ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml) endif() diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index 869139b..5812a04 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -183,7 +183,7 @@ bool IndicatorSoundTestBase::resetAllowAmplifiedVolume() proc.start("gsettings", QStringList() << "reset" -#ifdef HAS_UBUNTU_SOUND_SCHEMA +#ifdef HAS_LOMIRI_SOUND_SCHEMA << "com.lomiri.sound" #else << "org.ayatana.sound" -- cgit v1.2.3 From ca1d6f23f767f1285edcd6403716649aac4cd140 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:30:56 +0100 Subject: Rename com.ubuntu.AccountsService.Sound --- data/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/accounts-service-access.vala | 2 +- tests/dbus-types/CMakeLists.txt | 4 ++-- tests/dbus-types/com.lomiri.AccountsService.Sound.xml | 9 +++++++++ tests/dbus-types/com.ubuntu.AccountsService.Sound.xml | 9 --------- tests/integration/CMakeLists.txt | 2 +- tests/integration/utils/dbus-pulse-volume.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsDefs.h | 2 +- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- .../accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml | 8 ++++++++ .../accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml | 8 -------- .../service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 tests/dbus-types/com.lomiri.AccountsService.Sound.xml delete mode 100644 tests/dbus-types/com.ubuntu.AccountsService.Sound.xml create mode 100644 tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml delete mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 0e30f7c..8e53533 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -102,7 +102,7 @@ DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d" # Accounts Service Iface: Greeter Sound ####################################### -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") # Nothing to do here... # Using files from Ubuntu specific package 'accountsservice-ubuntu-schemas'. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 761e87b..49d2715 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ else() set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") else() diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 9973704..4287d86 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -144,7 +144,7 @@ public class AccountsServiceAccess : Object if (user_path_variant.check_format_string ("(o)", true)) { user_path_variant.get ("(o)", out user_path); #if HAS_UT_ACCTSERVICE_SOUND_SETTINGS - _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound"); + _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.lomiri.AccountsService.Sound"); #else _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "org.ayatana.AccountsService.Sound"); #endif diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index 5323f51..cbe382a 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -14,8 +14,8 @@ set(dbusinterface_accounts_xml "org.freedesktop.Accounts.xml") set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES CLASSNAME AccountsInterface) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - set(dbusinterface_accountssound_xml "com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + set(dbusinterface_accountssound_xml "com.lomiri.AccountsService.Sound.xml") else() set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") endif() diff --git a/tests/dbus-types/com.lomiri.AccountsService.Sound.xml b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml new file mode 100644 index 0000000..fb97049 --- /dev/null +++ b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml deleted file mode 100644 index 27c915a..0000000 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e803a87..eef04f2 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -37,7 +37,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_HOME="${TEST_HOME}" ) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) endif() diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index cdbba6d..b99a509 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -141,7 +141,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), + QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), #endif diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0a1806d..9726a9a 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 421e155..e737a07 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) - set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") + set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") endif() diff --git a/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml new file mode 100644 index 0000000..d51abd2 --- /dev/null +++ b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml deleted file mode 100644 index da9e8aa..0000000 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8a19db8..b43f162 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif -- cgit v1.2.3 From 0c5bd272f52a644b114884bec0d3ef1f55ec5448 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:31:30 +0100 Subject: d/copyright: Update copyright attributions for renamed files. --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 7bdcd9e..89bd33a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -152,7 +152,7 @@ Files: AUTHORS src/gmenuharness/CMakeLists.txt tests/CMakeLists.txt tests/dbus-types/CMakeLists.txt - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml + tests/dbus-types/com.lomiri.AccountsService.Sound.xml tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml tests/dbus-types/org.ayatana.AccountsService.Sound.xml tests/dbus-types/org.freedesktop.Accounts.xml @@ -166,7 +166,7 @@ Files: AUTHORS tests/manual tests/service-mocks/CMakeLists.txt tests/service-mocks/accounts-mock/CMakeLists.txt - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml + tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml tests/service-mocks/media-player-mpris-mock/CMakeLists.txt -- cgit v1.2.3 From 9b7fe562fd8bb40baa524092bfea8d15de41262f Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:46:56 +0100 Subject: Drop unused HAVE_UT_ACCTSERVICE_SOUND_SETTINGS --- src/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49d2715..b39bf34 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,10 +24,7 @@ else() endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") -else() - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS OFF) endif() vapi_gen(accounts-service -- cgit v1.2.3 From ed47e0fd57235565fe5800cb29d97773ac5c6dc5 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:54:40 +0100 Subject: Rename HAS_UT_ACCTSERVICE_SOUND_SETTINGS --- src/CMakeLists.txt | 2 +- src/accounts-service-access.vala | 2 +- tests/integration/CMakeLists.txt | 2 +- tests/integration/utils/dbus-pulse-volume.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsDefs.h | 2 +- tests/service-mocks/accounts-mock/CMakeLists.txt | 2 +- tests/service-mocks/media-player-mpris-mock/CMakeLists.txt | 2 +- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b39bf34..37074e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,7 @@ else() endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") + set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS") endif() vapi_gen(accounts-service diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 4287d86..19a27c6 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -143,7 +143,7 @@ public class AccountsServiceAccess : Object string user_path; if (user_path_variant.check_format_string ("(o)", true)) { user_path_variant.get ("(o)", out user_path); -#if HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.lomiri.AccountsService.Sound"); #else _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "org.ayatana.AccountsService.Sound"); diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index eef04f2..8193341 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -38,7 +38,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s ) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() set(GLIB_REQUIRED_VERSION 2.26) diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index b99a509..2338de1 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -140,7 +140,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) { QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 9726a9a..660f240 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char ACCOUNTS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index e737a07..bcb9608 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index f0c06e6..e4ccc71 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() add_definitions(-DQT_NO_KEYWORDS=1) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index b43f162..8fd3bda 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char MEDIA_PLAYER_MPRIS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; -- cgit v1.2.3 From dcef1e0f705fc625039550693f70979e82966582 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 22:13:55 +0100 Subject: Use 'ayatana' namespace for unit tests. --- tests/service-mocks/DBusPropertiesNotifier.cpp | 2 +- tests/service-mocks/DBusPropertiesNotifier.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsDefs.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsMock.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsMock.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h | 4 ++-- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- tests/service-mocks/accounts-mock/main.cpp | 2 +- tests/service-mocks/media-player-mpris-mock/CMakeLists.txt | 4 ++-- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 4 ++-- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp | 2 +- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h | 4 ++-- tests/service-mocks/media-player-mpris-mock/main.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/service-mocks/DBusPropertiesNotifier.cpp b/tests/service-mocks/DBusPropertiesNotifier.cpp index 686e4e9..00313a7 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.cpp +++ b/tests/service-mocks/DBusPropertiesNotifier.cpp @@ -20,7 +20,7 @@ #include -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; void DBusPropertiesNotifier::notifyPropertyChanged(QDBusConnection const & connection, QString const & interface, diff --git a/tests/service-mocks/DBusPropertiesNotifier.h b/tests/service-mocks/DBusPropertiesNotifier.h index 9fa013b..236a051 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.h +++ b/tests/service-mocks/DBusPropertiesNotifier.h @@ -19,7 +19,7 @@ #include -namespace ubuntu +namespace ayatana { namespace indicators @@ -45,4 +45,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 660f240..bf66208 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -37,4 +37,4 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsMock.cpp b/tests/service-mocks/accounts-mock/AccountsMock.cpp index 5c92dc5..af2065a 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsMock.cpp @@ -20,7 +20,7 @@ #include "AccountsMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsMock::AccountsMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsMock.h b/tests/service-mocks/accounts-mock/AccountsMock.h index 72372e0..e8efbdb 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.h +++ b/tests/service-mocks/accounts-mock/AccountsMock.h @@ -21,7 +21,7 @@ #include #include -namespace ubuntu +namespace ayatana { namespace indicators @@ -47,4 +47,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp index b0e4862..e4f83ed 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp @@ -22,7 +22,7 @@ #include "AccountsServiceSoundMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsServiceSoundMock::AccountsServiceSoundMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h index fd5104e..bcc2413 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h @@ -22,7 +22,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -59,4 +59,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index bcb9608..1549249 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -22,13 +22,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservic qt5_add_dbus_adaptor(adaptor_files ${dbusinterface_sound_xml} AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock + ayatana::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml AccountsMock.h - ubuntu::indicators::testing::AccountsMock + ayatana::indicators::testing::AccountsMock AccountsMockAdaptor) add_executable( diff --git a/tests/service-mocks/accounts-mock/main.cpp b/tests/service-mocks/accounts-mock/main.cpp index d6cd1d3..f937022 100644 --- a/tests/service-mocks/accounts-mock/main.cpp +++ b/tests/service-mocks/accounts-mock/main.cpp @@ -26,7 +26,7 @@ #include "AccountsMock.h" #include "AccountsMockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index e4ccc71..4f58791 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -23,13 +23,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_mediaplayermpris_xml} Med qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.Player.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayerMprisMockAdaptor) qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayer2MockAdaptor) add_executable( diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8fd3bda..24fa986 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -37,5 +37,5 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp index 25fe0b7..9ec9905 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp @@ -19,7 +19,7 @@ #include "MediaPlayerMprisMock.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; MediaPlayerMprisMock::MediaPlayerMprisMock(QString const &playerName, QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h index 58dce8d..0a45075 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h @@ -23,7 +23,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -74,4 +74,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/main.cpp b/tests/service-mocks/media-player-mpris-mock/main.cpp index 8945673..877f59f 100644 --- a/tests/service-mocks/media-player-mpris-mock/main.cpp +++ b/tests/service-mocks/media-player-mpris-mock/main.cpp @@ -25,7 +25,7 @@ #include "MediaPlayerMprisMockAdaptor.h" #include "MediaPlayer2MockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { -- cgit v1.2.3 From 77f48a545b831f42a8f1e22b81dd242ff57ee23e Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 22:55:13 +0100 Subject: Fix missing HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS definition --- src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37074e0..d1f8239 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,8 +11,11 @@ if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml") endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml") + set (HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS ON) set (VALA_FILE_ACCTSERVICE_PRIVACY_SETTINGS "accounts-service-privacy-settings") set (VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS") +else() + set (HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS OFF) endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") @@ -214,7 +217,7 @@ vala_add(ayatana-indicator-sound-service accounts-service-sound-settings.vala ) -if(${HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS}) +if(${HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS}) vala_add(ayatana-indicator-sound-service accounts-service-system-sound-settings.vala ) -- cgit v1.2.3