Update to 3.34.1

This commit is contained in:
Kalev Lember 2019-10-07 10:12:59 +02:00
parent dac73f010c
commit 1f72aa7174
4 changed files with 7 additions and 60 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@
/gnome-control-center-3.33.90.tar.xz
/gnome-control-center-3.34.0.tar.xz
/gnome-control-center-3.34.0.1.tar.xz
/gnome-control-center-3.34.1.tar.xz

View File

@ -1,54 +0,0 @@
From e4508e013089cf788fd7386e189b311bdedd88e0 Mon Sep 17 00:00:00 2001
From: Iain Lane <iainl@gnome.org>
Date: Sat, 5 Oct 2019 11:57:48 +0100
Subject: [PATCH] network: Accept empty values for the cloned mac address
Empty is a valid value here. It means the setting is not set. Two places
need to be updated:
- the validation function
- when retrieving the value from the combo, empty strings need to be
mapped to a setting value of NULL
Closes #677
---
panels/network/connection-editor/ce-page.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/panels/network/connection-editor/ce-page.c b/panels/network/connection-editor/ce-page.c
index 4059ad328..adec1ae10 100644
--- a/panels/network/connection-editor/ce-page.c
+++ b/panels/network/connection-editor/ce-page.c
@@ -416,13 +416,19 @@ ce_page_setup_cloned_mac_combo (GtkComboBoxText *combo, const char *current)
char *
ce_page_cloned_mac_get (GtkComboBoxText *combo)
{
+ g_autofree gchar *active_text = NULL;
const char *id;
id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (combo));
if (id)
return g_strdup (id);
- return gtk_combo_box_text_get_active_text (combo);
+ active_text = gtk_combo_box_text_get_active_text (combo);
+
+ if (active_text[0] == '\0')
+ return NULL;
+
+ return g_steal_pointer (&active_text);
}
gboolean
@@ -471,7 +477,7 @@ ce_page_cloned_mac_combo_valid (GtkComboBoxText *combo)
active_text = gtk_combo_box_text_get_active_text (combo);
- return ce_page_address_is_valid (active_text);
+ return active_text[0] == '\0' || ce_page_address_is_valid (active_text);
}
const gchar *
--
2.22.0

View File

@ -9,8 +9,8 @@
%define gnome_bluetooth_version 3.18.2
Name: gnome-control-center
Version: 3.34.0.1
Release: 3%{?dist}
Version: 3.34.1
Release: 1%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
@ -20,9 +20,6 @@ Source0: https://download.gnome.org/sources/gnome-control-center/3.34/gno
# https://bugzilla.gnome.org/show_bug.cgi?id=695691
Patch0: distro-logo.patch
# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/585
Patch1: 585.patch
BuildRequires: chrpath
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
@ -192,6 +189,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties
%changelog
* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Sat Oct 05 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.34.0.1-3
- Add patch to fix editing wired connection settings (rhbz#1750805)
- Remove broken remote printers patch

View File

@ -1 +1 @@
SHA512 (gnome-control-center-3.34.0.1.tar.xz) = 784e85fe0302831b1dc15f200a900026c527fe8f45bfb8d8d2371c24dbc1fe3f967583d7607694cb77f66e2084c9e04b382fe1e6b5500964435a7ecd74bf1489
SHA512 (gnome-control-center-3.34.1.tar.xz) = 19eb88839891a17f270371f23011bdc3a3bcce5aafc0304ae0a209a0cdab8fb868fcb7f2de7c81b2fa9b0166c0760745a4cba53f9e614d2c8154ceccbb616722