rpms/evolution-data-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: RHEL-77352 (EBackend: Change when adding signal handler for "network-changed")

Browse Source
This commit is contained in:
Milan Crha 2025-02-03 17:28:23 +01:00
parent 2f0001ad6e
commit 1e15940168
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
0001-ebackend-network-change-handler.patch Normal file
View File

@ -0,0 +1,66 @@
From 9a3d7e63cbdc2703f18f70cb38d55a8741cb919d Mon Sep 17 00:00:00 2001
Date: Mon, 3 Feb 2025 13:43:08 +0100
Subject: [PATCH] EBackend: Change when adding signal handler for
"network-changed"
The handler requires a valid ESource instance, otherwise there's printed
a runtime warning about failed assertion for "E_IS_SOURCE (source)" from
the e_source_unset_last_credentials_required_arguments() function.
The signal can be (rarely) received between the class' init() and
constructed() methods, thus before the object's `source` property
is set, leading to this runtime warning.
The fix is to listen for the "network-changed" signal only after
the constructed() function is called. It does not make much sense to do
it before that anyway.
---
src/libebackend/e-backend.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libebackend/e-backend.c b/src/libebackend/e-backend.c
index 0af7240536..7932c54866 100644
--- a/src/libebackend/e-backend.c
+++ b/src/libebackend/e-backend.c
@@ -701,12 +701,18 @@ backend_constructed (GObject *object)
EBackend *backend;
ESource *source;
const gchar *extension_name;
+ gulong handler_id;
backend = E_BACKEND (object);
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (e_backend_parent_class)->constructed (object);
+ handler_id = g_signal_connect (
+ backend->priv->network_monitor, "network-changed",
+ G_CALLBACK (backend_network_changed_cb), backend);
+ backend->priv->network_changed_handler_id = handler_id;
+
/* Get an initial GSocketConnectable from the data
* source's [Authentication] extension, if present. */
source = e_backend_get_source (backend);
@@ -854,7 +860,6 @@ static void
e_backend_init (EBackend *backend)
{
GNetworkMonitor *network_monitor;
- gulong handler_id;
backend->priv = e_backend_get_instance_private (backend);
backend->priv->prompter = e_user_prompter_new ();
@@ -874,11 +879,6 @@ e_backend_init (EBackend *backend)
network_monitor = e_network_monitor_get_default ();
backend->priv->network_monitor = g_object_ref (network_monitor);
backend->priv->online = g_network_monitor_get_network_available (network_monitor);
-
- handler_id = g_signal_connect (
- backend->priv->network_monitor, "network-changed",
- G_CALLBACK (backend_network_changed_cb), backend);
- backend->priv->network_changed_handler_id = handler_id;
}
/**
--
GitLab

7
evolution-data-server.spec
View File

@ -53,7 +53,7 @@
Name: evolution-data-server
Version: 3.52.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Backend data server for Evolution
License: LGPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@ -61,6 +61,8 @@ Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz
# 0-99: General patches
Patch01: 0001-ebackend-network-change-handler.patch
# 100-199: Flatpak-specific patches
# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
Patch100: Make-DBUS_SERVICES_PREFIX-runtime-configurable.patch
@ -511,6 +513,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/installed-tests
%changelog
* Mon Feb 03 2025 Milan Crha <mcrha@redhat.com> - 3.52.4-3
- Resolves: RHEL-77352 (EBackend: Change when adding signal handler for "network-changed")
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.52.4-2
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018