From 5943421cd1c6f1a133c2ee02975d2f789a1f6157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 20 Oct 2025 22:44:11 +0200 Subject: [PATCH 1/2] call-display: Avoid deprecations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to emit warnings in other projects that use us as a subproject. See https://gitlab.gnome.org/World/Phosh/libcall-ui/-/issues/31 (cherry picked from commit a98fa7de3ce56399761da8134ef9cd49dd90eea0) Signed-off-by: Guido Günther Part-of: --- src/cui-call-display.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/cui-call-display.c b/src/cui-call-display.c index 3a62b43..845971d 100644 --- a/src/cui-call-display.c +++ b/src/cui-call-display.c @@ -133,7 +133,9 @@ mute_toggled_cb (GtkToggleButton *togglebutton, gboolean want_mute; want_mute = gtk_toggle_button_get_active (togglebutton); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS call_audio_mute_mic_async (want_mute, on_libcallaudio_async_finished, NULL); +G_GNUC_END_IGNORE_DEPRECATIONS } @@ -144,7 +146,9 @@ speaker_toggled_cb (GtkToggleButton *togglebutton, gboolean want_speaker; want_speaker = gtk_toggle_button_get_active (togglebutton); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS call_audio_enable_speaker_async (want_speaker, on_libcallaudio_async_finished, NULL); +G_GNUC_END_IGNORE_DEPRECATIONS } @@ -230,18 +234,23 @@ on_call_state_changed (CuiCallDisplay *self, (GTK_WIDGET (self->gsm_controls), state != CUI_CALL_STATE_CALLING); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* TODO Only switch to "call" audio mode for cellular calls */ call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, on_libcallaudio_async_finished, NULL); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS self->needs_cam_reset = TRUE; break; case CUI_CALL_STATE_DISCONNECTED: - if (self->needs_cam_reset) + if (self->needs_cam_reset) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, on_libcallaudio_async_finished, NULL); +G_GNUC_END_IGNORE_DEPRECATIONS + } gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE); break; @@ -535,7 +544,9 @@ cui_call_display_init (CuiCallDisplay *self) { gtk_widget_init_template (GTK_WIDGET (self)); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (!call_audio_is_inited ()) { +G_GNUC_END_IGNORE_DEPRECATIONS g_warning ("libcallaudio not initialized"); gtk_widget_set_sensitive (GTK_WIDGET (self->speaker), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (self->mute), FALSE); -- GitLab From 005188246c6485c86247dfb7edf2da640bc17f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 6 Nov 2025 21:43:01 +0100 Subject: [PATCH 2/2] main: Ignore deprecations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No point in bothering downstreams Signed-off-by: Guido Günther (cherry picked from commit 2a344938594c8afad174fcb02db8697ad242ffbc) Part-of: --- src/cui-main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cui-main.c b/src/cui-main.c index 35dc321..2a8c2af 100644 --- a/src/cui-main.c +++ b/src/cui-main.c @@ -95,7 +95,9 @@ cui_init (gboolean init_callaudio) cui_init_css (); if (init_callaudio) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS call_audio_init (NULL); +G_GNUC_END_IGNORE_DEPRECATIONS call_audio_initialized = TRUE; } @@ -112,7 +114,9 @@ void cui_uninit (void) { if (call_audio_initialized) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS call_audio_deinit (); +G_GNUC_END_IGNORE_DEPRECATIONS call_audio_initialized = FALSE; } } -- GitLab