Additional fix to the Language Chooser issue

This patch was missing from 02889e7ad3.

Related #1931972
This commit is contained in:
Felipe Borges 2021-02-24 10:34:19 +01:00
parent 771bb55187
commit 8cd1e6a058
2 changed files with 27 additions and 4 deletions

View File

@ -1,4 +1,4 @@
From 716701952230f4e3e54a4c669861a12ba19e93ba Mon Sep 17 00:00:00 2001
From 429bbe0564f8c129717635e8979fa6fa761a0f1c Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Tue, 23 Feb 2021 10:24:49 -0300
Subject: [PATCH] common: Add missing <child> tag to CcLanguageChooser
@ -9,9 +9,16 @@ fails to parse and blanks the dialog.
Add the missing <child> tag around the "More" row object.
Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1270
common: Rename 'check' to 'check_image'
The C code tries to fetch and use 'check_image', but the UI definition
calls it 'check', which throws a few warnings. Renaming it in the UI file
is easier than in the C file, so I went with the former.
---
panels/common/cc-language-chooser.ui | 47 +++++++++++++++-------------
1 file changed, 26 insertions(+), 21 deletions(-)
panels/common/cc-language-row.ui | 2 +-
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/panels/common/cc-language-chooser.ui b/panels/common/cc-language-chooser.ui
index 5449fb3dd..885eb437a 100644
@ -71,6 +78,19 @@ index 5449fb3dd..885eb437a 100644
</object>
</child>
</object>
diff --git a/panels/common/cc-language-row.ui b/panels/common/cc-language-row.ui
index 3f2d67b68..957df54ab 100644
--- a/panels/common/cc-language-row.ui
+++ b/panels/common/cc-language-row.ui
@@ -18,7 +18,7 @@
</object>
</child>
<child>
- <object class="GtkImage" id="check">
+ <object class="GtkImage" id="check_image">
<property name="visible">False</property>
<property name="icon-name">object-select-symbolic</property>
<property name="icon-size">1</property>
--
2.28.0
2.29.2

View File

@ -13,7 +13,7 @@
Name: gnome-control-center
Version: 40~beta
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
@ -198,6 +198,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties
%changelog
* Wed Feb 24 2021 Felipe Borges <feborges@redhat.com> - 40~beta-3
- Include missing patch from 40~beta-2
* Tue Feb 23 2021 Felipe Borges <feborges@redhat.com> - 40~beta-2
- Fix error preventing the Region & Language panel from loading