66 lines
2.9 KiB
Diff
66 lines
2.9 KiB
Diff
From 5d486ad2af74a6b5f643819f1000cb8388eba43d Mon Sep 17 00:00:00 2001
|
|
From: Joshua Strobl <me@joshuastrobl.com>
|
|
Date: Sat, 16 Mar 2024 16:44:46 +0200
|
|
Subject: [PATCH] fix: FTBFS with incompatible-pointer-types
|
|
|
|
---
|
|
meson.build | 3 ++-
|
|
panels/display/cc-display-panel.c | 2 +-
|
|
panels/display/cc-display-settings.c | 2 +-
|
|
panels/sound/cc-sound-panel.c | 2 +-
|
|
4 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index d0744aa89..c8dde2c2b 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -77,7 +77,8 @@ if get_option('buildtype').contains('debug')
|
|
'-Wmissing-prototypes',
|
|
'-Wnested-externs',
|
|
'-Wno-strict-aliasing',
|
|
- '-Wno-sign-compare'
|
|
+ '-Wno-sign-compare',
|
|
+ '-Wno-incompatible-pointer-types'
|
|
]
|
|
|
|
common_flags += cc.get_supported_arguments(test_cflags)
|
|
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
|
|
index 07ac4f291..61a6dab84 100644
|
|
--- a/panels/display/cc-display-panel.c
|
|
+++ b/panels/display/cc-display-panel.c
|
|
@@ -959,7 +959,7 @@ set_current_output (CcDisplayPanel *panel,
|
|
if (cc_has_fractional_key())
|
|
{
|
|
lockdown=cc_display_config_get_fractional_scaling (panel->current_config);
|
|
- gtk_widget_set_sensitive(panel->automatic_screen_lock_switch, !lockdown);
|
|
+ gtk_widget_set_sensitive(GTK_WIDGET (panel->automatic_screen_lock_switch), !lockdown);
|
|
}
|
|
}
|
|
|
|
diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c
|
|
index 406e7fe7c..0cf1369b4 100644
|
|
--- a/panels/display/cc-display-settings.c
|
|
+++ b/panels/display/cc-display-settings.c
|
|
@@ -450,7 +450,7 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
|
|
cc_display_config_get_fractional_scaling (self->config));
|
|
|
|
gtk_switch_set_active (GTK_SWITCH (self->scale_fractional_switch), cc_display_config_get_fractional_scaling (self->config));
|
|
- gtk_widget_set_visible(self->scale_fractional_row, cc_has_fractional_key());
|
|
+ gtk_widget_set_visible(GTK_WIDGET (self->scale_fractional_row), cc_has_fractional_key());
|
|
|
|
gtk_widget_set_visible (self->underscanning_row,
|
|
cc_display_monitor_supports_underscanning (self->selected_output) &&
|
|
diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
|
|
index c447bbf9a..75291d547 100644
|
|
--- a/panels/sound/cc-sound-panel.c
|
|
+++ b/panels/sound/cc-sound-panel.c
|
|
@@ -300,7 +300,7 @@ cc_sound_panel_init (CcSoundPanel *self)
|
|
G_CONNECT_SWAPPED);
|
|
allow_amplified_changed_cb (self);
|
|
|
|
- gtk_widget_set_visible(self->budgie_output_listbox, TRUE);
|
|
+ gtk_widget_set_visible(GTK_WIDGET (self->budgie_output_listbox), TRUE);
|
|
gtk_widget_set_visible(GTK_WIDGET (self->output_volume_slider), FALSE);
|
|
g_settings_bind (self->sound_settings, "allow-volume-overdrive",
|
|
self->allow_amplify_switch, "active", G_SETTINGS_BIND_DEFAULT);
|