rpms/gnome-control-center
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to fix editing wired connection settings (rhbz#1750805)

Browse Source 
Remove broken remote printers patch
This commit is contained in:
Michael Catanzaro 2019-10-05 10:31:52 -05:00
parent f8b0e42dd1
commit dac73f010c
3 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
579.patch
View File

@ -1,36 +0,0 @@
From e497ad900d66b796935872baf837850a77155b4a Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Tue, 1 Oct 2019 16:45:59 +0200
Subject: [PATCH] printers: Check whether URI is valid while searching for
printers
Fixes #679
---
panels/printers/pp-new-printer-dialog.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
index 93e95e9a8..651c0d8f3 100644
--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -1607,13 +1607,16 @@ search_address (const gchar *text,
if (text && text[0] != '\0')
{
+ g_autoptr(GSocketConnectable) conn;
gchar *scheme = NULL;
gchar *host = NULL;
gint port;
parse_uri (text, &scheme, &host, &port);
- if (host)
+ conn = g_network_address_parse_uri (host, port, NULL);
+
+ if (host != NULL && conn != NULL)
{
THostSearchData *search_data;
--
2.22.0

54
585.patch Normal file
View File

@ -0,0 +1,54 @@
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

10
gnome-control-center.spec
View File

@ -10,7 +10,7 @@
Name: gnome-control-center
Version: 3.34.0.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
@ -20,8 +20,8 @@ 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/579
Patch1: 579.patch
# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/585
Patch1: 585.patch
BuildRequires: chrpath
BuildRequires: cups-devel
@ -192,6 +192,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties
%changelog
* 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
* Wed Oct 02 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.34.0.1-2
- Add patch to fix crash when configuring remote printers