Fix freeze in wired connection properties
Additionally, drop unnecssary chrpath usage.
This commit is contained in:
parent
1943e4d648
commit
1c64bfde6e
32
gnome-control-center-42.1-unparent-child.patch
Normal file
32
gnome-control-center-42.1-unparent-child.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 1501a84f626997fa62ad4d02acedccda23adbd90 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Tue, 3 May 2022 10:50:33 +0200
|
||||||
|
Subject: [PATCH] connection-editor: Unparent child widget on dispose
|
||||||
|
|
||||||
|
WirelessSecurityWPAEAP is a GtkWidget owned by the CEPage8021xSecurity
|
||||||
|
widget, which is supposed to "unparent" it on "dispose" (since parents
|
||||||
|
hold a reference to child widgets). Instead we were calling
|
||||||
|
g_clear_object on it.
|
||||||
|
|
||||||
|
Fixes #1671
|
||||||
|
---
|
||||||
|
panels/network/connection-editor/ce-page-8021x-security.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c
|
||||||
|
index deec51fc8..f0b36e70a 100644
|
||||||
|
--- a/panels/network/connection-editor/ce-page-8021x-security.c
|
||||||
|
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
|
||||||
|
@@ -154,8 +154,8 @@ ce_page_8021x_security_dispose (GObject *object)
|
||||||
|
{
|
||||||
|
CEPage8021xSecurity *self = CE_PAGE_8021X_SECURITY (object);
|
||||||
|
|
||||||
|
+ gtk_widget_unparent (GTK_WIDGET (self->security));
|
||||||
|
g_clear_object (&self->connection);
|
||||||
|
- g_clear_object (&self->security);
|
||||||
|
g_clear_object (&self->group);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (ce_page_8021x_security_parent_class)->dispose (object);
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -22,8 +22,9 @@ Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_
|
|||||||
|
|
||||||
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
|
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
|
||||||
Patch0: distro-logo.patch
|
Patch0: distro-logo.patch
|
||||||
|
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1671
|
||||||
|
Patch1: gnome-control-center-42.1-unparent-child.patch
|
||||||
|
|
||||||
BuildRequires: chrpath
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: docbook-style-xsl libxslt
|
BuildRequires: docbook-style-xsl libxslt
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -173,9 +174,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
|
|||||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
|
||||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
|
||||||
|
|
||||||
# Remove rpath
|
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
|
||||||
|
|
||||||
%find_lang %{name} --all-name --with-gnome
|
%find_lang %{name} --all-name --with-gnome
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
|
Loading…
Reference in New Issue
Block a user