Merge lp:~muktupavels/indicator-sound/indicator-sound into lp:indicator-sound

[Alberts Muktupāvels]

media-player-list-mpris: avoid critical warning

[Alberts Muktupāvels (muktupavels)]

Rebuild requires fix in vala - https://gitlab.gnome.org/GNOME/vala/-/merge_requests/260.

[lp:~muktupavels/indicator-sound/indicator-sound]

569. By Alberts Muktupāvels on 2022-10-10

accounts-service-user: fix warnings

warning: Access to possible `null'. Perform a check or use an unsafe cast.

570. By Alberts Muktupāvels on 2022-10-10

media-player-list-mpris: fix critical

indicator-sound-CRITICAL:
media_player_list_mpris_insert: assertion 'desktop_id != NULL' failed

Warning can be reproduced watching YouTube video in Google Chrome.

Unmerged revisions

570. By Alberts Muktupāvels on 2022-10-10

media-player-list-mpris: fix critical

indicator-sound-CRITICAL:
media_player_list_mpris_insert: assertion 'desktop_id != NULL' failed

Warning can be reproduced watching YouTube video in Google Chrome.

569. By Alberts Muktupāvels on 2022-10-10

accounts-service-user: fix warnings

warning: Access to possible `null'. Perform a check or use an unsafe cast.

568. By Alberts Muktupāvels on 2022-10-10

cmake: bump minimum required version to 3.18.0

Fixes following warning:
CMake Deprecation Warning at CMakeLists.txt:2 (cmake_minimum_required):
  Compatibility with CMake < 2.8.12 will be removed from a future version of
  CMake.

567. By Alberts Muktupāvels on 2022-10-10

tests: stop using qt5_use_modules

Fixes following warnings:
CMake Warning (dev) at /usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake:44 (message):
  qt5_use_modules is not part of the official API, and might be removed in Qt 6.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2020-06-04 12:59:23 +0000
+++ CMakeLists.txt	2022-10-10 12:41:15 +0000
@@ -1,5 +1,5 @@
 project(indicator-sound C CXX)
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.18.0)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 

=== modified file 'src/accounts-service-user.vala'
--- src/accounts-service-user.vala	2015-12-31 20:49:42 +0000
+++ src/accounts-service-user.vala	2022-10-10 12:41:15 +0000
@@ -184,7 +184,9 @@
 		try {
 			this.privacyproxy = Bus.get_proxy.end (res);
 
-			(this.privacyproxy as DBusProxy).g_properties_changed.connect((proxy, changed, invalid) => {
+			var gproxy = this.privacyproxy as DBusProxy;
+
+			gproxy.g_properties_changed.connect((proxy, changed, invalid) => {
 				var welcomeval = changed.lookup_value("MessagesWelcomeScreen", VariantType.BOOLEAN);
 				if (welcomeval != null) {
 					debug("Messages on welcome screen changed");
@@ -203,7 +205,9 @@
 		try {
 			this.syssoundproxy = Bus.get_proxy.end (res);
 
-			(this.syssoundproxy as DBusProxy).g_properties_changed.connect((proxy, changed, invalid) => {
+			var gproxy = this.syssoundproxy as DBusProxy;
+
+			gproxy.g_properties_changed.connect((proxy, changed, invalid) => {
 				var silentvar = changed.lookup_value("SilentMode", VariantType.BOOLEAN);
 				if (silentvar != null) {
 					debug("Silent Mode changed");

=== modified file 'src/media-player-list-mpris.vala'
--- src/media-player-list-mpris.vala	2021-09-22 16:12:10 +0000
+++ src/media-player-list-mpris.vala	2022-10-10 12:41:15 +0000
@@ -115,6 +115,9 @@
 		try {
 			MprisRoot mpris2_root = Bus.get_proxy_sync (BusType.SESSION, name, MPRIS_MEDIA_PLAYER_PATH);
 
+			if (mpris2_root.DesktopEntry == null)
+				return;
+
 			var player = this.insert (mpris2_root.DesktopEntry);
 			if (player != null)
 				player.attach (mpris2_root, name);

=== modified file 'tests/dbus-types/CMakeLists.txt'
--- tests/dbus-types/CMakeLists.txt	2016-01-07 05:28:51 +0000
+++ tests/dbus-types/CMakeLists.txt	2022-10-10 12:41:15 +0000
@@ -48,8 +48,8 @@
   dbus-action-result.cpp
 )
 
-qt5_use_modules(
+target_link_libraries(
     sound-indicator-dbus-interfaces
-    Core
-    DBus
+    Qt5::Core
+    Qt5::DBus
 )

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2018-04-20 21:40:55 +0000
+++ tests/integration/CMakeLists.txt	2022-10-10 12:41:15 +0000
@@ -56,11 +56,11 @@
     ${INTEGRATION_TESTS_SRC}
 )
 
-qt5_use_modules(
+target_link_libraries(
     integration-tests
-    Core
-    DBus
-    Test
+    Qt5::Core
+    Qt5::DBus
+    Qt5::Test
 )
 
 target_link_libraries(
@@ -105,18 +105,18 @@
     ${GET-VOLUME-SRC}
 )
 
-qt5_use_modules(
+target_link_libraries(
     set-volume
-    Core
-    DBus
-    Test
+    Qt5::Core
+    Qt5::DBus
+    Qt5::Test
 )
 
-qt5_use_modules(
+target_link_libraries(
     get-volume
-    Core
-    DBus
-    Test
+    Qt5::Core
+    Qt5::DBus
+    Qt5::Test
 )
 
 target_link_libraries(

=== modified file 'tests/service-mocks/accounts-mock/CMakeLists.txt'
--- tests/service-mocks/accounts-mock/CMakeLists.txt	2015-12-23 13:35:46 +0000
+++ tests/service-mocks/accounts-mock/CMakeLists.txt	2022-10-10 12:41:15 +0000
@@ -35,8 +35,8 @@
   main.cpp
 )
 
-qt5_use_modules(
+target_link_libraries(
     accounts-service-sound
-    Core
-    DBus
+    Qt5::Core
+    Qt5::DBus
 )

=== modified file 'tests/service-mocks/media-player-mpris-mock/CMakeLists.txt'
--- tests/service-mocks/media-player-mpris-mock/CMakeLists.txt	2015-12-23 13:35:46 +0000
+++ tests/service-mocks/media-player-mpris-mock/CMakeLists.txt	2022-10-10 12:41:15 +0000
@@ -44,16 +44,16 @@
   testplayers
 )
 
-qt5_use_modules(
+target_link_libraries(
     media-player-mpris-mock
-    Core
-    DBus
+    Qt5::Core
+    Qt5::DBus
 )
 
-qt5_use_modules(
+target_link_libraries(
     media-player-mpris-mock-update
-    Core
-    DBus
+    Qt5::Core
+    Qt5::DBus
 )
 
 # test players desktop files