pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1166089 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1166089
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=276
This commit is contained in:
Ana Guerrero 2024-04-09 14:46:27 +00:00 committed by Git OBS Bridge
commit 6b9f70b5be
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
boo1221868.patch Normal file
View File

@ -0,0 +1,54 @@
From a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 4 Apr 2024 08:52:40 +0200
Subject: [PATCH] I#2712 - Crash when hiding completed tasks
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2712
---
src/calendar/gui/e-task-table.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c
index a8e906e3e4..d92b279cb2 100644
--- a/src/calendar/gui/e-task-table.c
+++ b/src/calendar/gui/e-task-table.c
@@ -1376,7 +1376,7 @@ hide_completed_rows_ready (GObject *source_object,
{
ECalModel *model = user_data;
ECalClient *cal_client;
- GSList *m, *objects;
+ GSList *m, *objects = NULL;
gboolean changed = FALSE;
gint pos;
GPtrArray *comp_objects;
@@ -1384,7 +1384,8 @@ hide_completed_rows_ready (GObject *source_object,
cal_client = E_CAL_CLIENT (source_object);
- e_cal_client_get_object_list_finish (cal_client, result, &objects, &error);
+ if (!e_cal_client_get_object_list_finish (cal_client, result, &objects, &error))
+ objects = NULL;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_error_free (error);
@@ -1448,14 +1449,15 @@ show_completed_rows_ready (GObject *source_object,
{
ECalClient *cal_client;
ECalModel *model = user_data;
- GSList *m, *objects;
+ GSList *m, *objects = NULL;
GPtrArray *comp_objects;
GError *error = NULL;
cal_client = E_CAL_CLIENT (source_object);
g_return_if_fail (cal_client != NULL);
- e_cal_client_get_object_list_finish (cal_client, result, &objects, &error);
+ if (!e_cal_client_get_object_list_finish (cal_client, result, &objects, &error))
+ objects = NULL;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_error_free (error);
--
GitLab

6
evolution.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 4 14:20:03 UTC 2024 - M K <tux93@opensuse.org>
- Add boo1221868.patch, fixing a crash when hiding competed tasks
(boo#1221868, glgo#GNOME/evolution#2712)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 15 07:14:21 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Mar 15 07:14:21 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

2
evolution.spec
View File

@ -29,6 +29,8 @@ License: CC-BY-SA-3.0 AND LGPL-2.0-only AND LGPL-3.0-only AND OLDAP-2.8 A
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
URL: https://wiki.gnome.org/Apps/Evolution/ URL: https://wiki.gnome.org/Apps/Evolution/
Source0: %{name}-%{version}.tar.zst Source0: %{name}-%{version}.tar.zst
# PATCH-FIX-UPSTREAM boo1221868.patch glgo#GNOME/evolution#2712
Patch0: boo1221868.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: bogofilter BuildRequires: bogofilter