From a300dbade55a6c1f8119f22a42eb9b57b284568b Mon Sep 17 00:00:00 2001
From: Matthijs Velsink <mvelsink@gnome.org>
Date: Tue, 7 Jan 2025 22:06:20 +0100
Subject: [PATCH] split-row: Use "both" for size group to avoid new GTK crash

New GTK changed layout algorithms for GtkBoxLayout, in particular adding
an assertion that happens to trip for the "vertical" GtkSizeGroup we
were using for CcSplitRow. "both" achieves exactly the same here in
terms of looks, and doesn't crash, so use that.

See discussion on
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8068#note_2313048
---
 panels/common/cc-split-row.c  | 2 +-
 panels/common/cc-split-row.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panels/common/cc-split-row.c b/panels/common/cc-split-row.c
index ee9350ec48..02f7800dc0 100644
--- a/panels/common/cc-split-row.c
+++ b/panels/common/cc-split-row.c
@@ -401,7 +401,7 @@ cc_split_row_set_compact (CcSplitRow *self,
                                   compact ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
   gtk_box_set_spacing (self->box, compact ? 6 : 18);
   gtk_size_group_set_mode (self->size_group,
-                           compact ? GTK_SIZE_GROUP_NONE : GTK_SIZE_GROUP_VERTICAL);
+                           compact ? GTK_SIZE_GROUP_NONE : GTK_SIZE_GROUP_BOTH);
 
   g_object_notify_by_pspec (G_OBJECT (self), props[PROP_COMPACT]);
 }
diff --git a/panels/common/cc-split-row.ui b/panels/common/cc-split-row.ui
index 09a18060ac..d9fab4c2a9 100644
--- a/panels/common/cc-split-row.ui
+++ b/panels/common/cc-split-row.ui
@@ -192,7 +192,7 @@
     </child>
   </template>
   <object class="GtkSizeGroup" id="size_group">
-    <property name="mode">vertical</property>
+    <property name="mode">both</property>
     <widgets>
       <widget name="default_option_checkbutton"/>
       <widget name="alternative_option_checkbutton"/>
-- 
GitLab