diff --git a/.gitignore b/.gitignore index e629073..236596e 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /gnome-control-center-45.beta.tar.xz /gnome-control-center-45.rc.tar.xz /gnome-control-center-45.0.tar.xz +/gnome-control-center-45.1.tar.xz diff --git a/fix-vpn-config.patch b/fix-vpn-config.patch deleted file mode 100644 index 1c82df3..0000000 --- a/fix-vpn-config.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6219cbdca5b807292ce53e8b6e46b7d52c1a9f62 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 29 Sep 2023 11:36:07 -0500 -Subject: [PATCH] network: fix editing connections without a device - -For example, fix adding new VPN connections. - -In 60b4956c051f86d7c2e23b46990172a3efcd7435 I correctly observed that we -need to not run code that requires a device when there is no device. -NetConnectionEditor is a multipurpose dialog and self->device is -optional when creating the dialog. E.g. when modifying VPN -configuration, we update just the configuration, not an NMDevice. - -However, I added this check too soon, before updating the connection -configuration. We need to update the configuration first, then only bail -before proceeding to update the device, not sooner. - -Fix #2668 ---- - .../connection-editor/net-connection-editor.c | 21 ++++++++++++------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index c51667f839..f97658405d 100644 ---- a/panels/network/connection-editor/net-connection-editor.c -+++ b/panels/network/connection-editor/net-connection-editor.c -@@ -240,6 +240,12 @@ updated_connection_cb (GObject *source_object, - - nm_connection_clear_secrets (NM_CONNECTION (source_object)); - -+ if (!self->device) { -+ update_complete (self, TRUE); -+ g_object_unref (self); -+ return; -+ } -+ - nm_device_reapply_async (self->device, NM_CONNECTION (self->orig_connection), - 0, 0, NULL, device_reapply_cb, self /* owned */); - } -@@ -251,12 +257,16 @@ added_connection_cb (GObject *source_object, - { - NetConnectionEditor *self = user_data; - g_autoptr(GError) error = NULL; -- gboolean success = TRUE; - - if (!nm_client_add_connection_finish (NM_CLIENT (source_object), res, &error)) { - g_warning ("Failed to add connection: %s", error->message); -- success = FALSE; -- update_complete (self, success); -+ update_complete (self, FALSE); -+ g_object_unref (self); -+ return; -+ } -+ -+ if (!self->device) { -+ update_complete (self, TRUE); - g_object_unref (self); - return; - } -@@ -272,11 +282,6 @@ apply_clicked_cb (NetConnectionEditor *self) - - eap_method_ca_cert_ignore_save (self->connection); - -- if (!self->device) { -- update_complete (self, TRUE); -- return; -- } -- - if (self->is_new_connection) { - nm_client_add_connection_async (self->client, - self->orig_connection, --- -GitLab - diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 792e477..a660d23 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -15,7 +15,7 @@ %bcond malcontent %[!0%{?rhel}] Name: gnome-control-center -Version: 45.0 +Version: 45.1 Release: %autorelease Summary: Utilities to configure the GNOME desktop @@ -25,9 +25,6 @@ Source0: https://download.gnome.org/sources/%{name}/45/%{name}-%{tarball_ Patch: 0001-keyboard-Use-new-gnome-desktop-api-for-getting-defau.patch -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1935/ -Patch: fix-vpn-config.patch - BuildRequires: desktop-file-utils BuildRequires: docbook-style-xsl libxslt BuildRequires: gcc diff --git a/sources b/sources index 45880b8..0333a82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-45.0.tar.xz) = c409174f2ce191d21018f7716254e9a5957c0c1daa63902bced6e196b2a1d73daf39364563183fbaca282b23548dc3a6c05b35b68a75334343ca44c23ec8c060 +SHA512 (gnome-control-center-45.1.tar.xz) = f2f7cb97b44729206f0b52d803c225f5f79de9adf0d7e5f06442b20786efa9ca4e5e04e3efa933f2efc54fed5a7a8fe16a5e9fda9dc710be1cfa4b8d47105760