diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-05-21 07:39:12 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-05-21 07:39:12 +0200 |
| commit | c462d2b65f31879819c175e7b423a9cc6dee9264 (patch) | |
| tree | 064eb1c33f570fc99f93e028fdfa461158d111a4 | |
| parent | f62a910194e5ef415b31e87dbb8f028a2367666f (diff) | |
| parent | 695faa485b170272d3a9a474f7377abee63739cb (diff) | |
| download | ayatana-indicator-sound-c462d2b65f31879819c175e7b423a9cc6dee9264.tar.gz ayatana-indicator-sound-c462d2b65f31879819c175e7b423a9cc6dee9264.tar.bz2 ayatana-indicator-sound-c462d2b65f31879819c175e7b423a9cc6dee9264.zip | |
Merge branch 'tari01-pr/fix-gcc14-build'
Attributes GH PR #104: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/104
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 10 |
2 files changed, 9 insertions, 9 deletions
@@ -1,6 +1,6 @@ /* * Copyright 2015 Canonical Ltd. - * Copyright 2023 Robert Tari <robert@tari.in> + * Copyright 2023-2024 Robert Tari <robert@tari.in> * * 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); 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 |