From 202b468afd2ee7ac82584cd5ffd9a10a7a8929a6 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 19 May 2024 17:05:46 +0200 Subject: src/main.c: Fix type casts --- src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index a6c83b5..188f31d 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* * Copyright 2015 Canonical Ltd. - * Copyright 2023 Robert Tari + * Copyright 2023-2024 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 @@ -65,12 +65,12 @@ on_bus_acquired(GDBusConnection *connection, } pgloop = pa_glib_mainloop_new(NULL); - options = indicator_sound_options_gsettings_new(); + options = INDICATOR_SOUND_OPTIONS (indicator_sound_options_gsettings_new ()); accounts_service_access = accounts_service_access_new(); volume = volume_control_pulse_new(options, pgloop, accounts_service_access); - warning = volume_warning_pulse_new(options, pgloop); + warning = VOLUME_WARNING (volume_warning_pulse_new (options, pgloop)); - service = indicator_sound_service_new (playerlist, volume, accounts, options, warning, accounts_service_access); + service = indicator_sound_service_new (playerlist, VOLUME_CONTROL (volume), accounts, options, warning, accounts_service_access); g_clear_object(&playerlist); g_clear_object(&options); -- cgit v1.2.3 From 695faa485b170272d3a9a474f7377abee63739cb Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 19 May 2024 17:06:36 +0200 Subject: tests/CMakeLists.txt: Silence some more Vala warnings --- tests/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 39711ed..0149739 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -80,11 +80,11 @@ vala_init(vala-mocks --vapidir=. ) -set_source_files_properties(media-player-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-warning-option -Wno-incompatible-pointer-types -Wno-discarded-qualifiers") -set_source_files_properties(media-player-list-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable") -set_source_files_properties(options-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable") -set_source_files_properties(volume-control-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types") -set_source_files_properties(volume-warning-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable") +set_source_files_properties(media-player-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-discarded-qualifiers") +set_source_files_properties(media-player-list-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable -Wno-discarded-qualifiers") +set_source_files_properties(options-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable -Wno-discarded-qualifiers") +set_source_files_properties(volume-control-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-discarded-qualifiers") +set_source_files_properties(volume-warning-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable -Wno-discarded-qualifiers") vala_add(vala-mocks media-player-mock.vala -- cgit v1.2.3