From 08a7548ed4c32f472b68e1bf49bc9c25d13cd0f32e8d6d98308cb25df9e3d1db Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Apr 2024 06:46:41 +0000 Subject: [PATCH] Accepting request 1164971 from home:tux93:branches:GNOME:Factory - Add boo1221868.patch, fixing a crash when hiding competed tasks (boo#1221868, glgo#GNOME/evolution#2712) OBS-URL: https://build.opensuse.org/request/show/1164971 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=496 --- boo1221868.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++ evolution.changes | 6 ++++++ evolution.spec | 2 ++ 3 files changed, 62 insertions(+) create mode 100644 boo1221868.patch diff --git a/boo1221868.patch b/boo1221868.patch new file mode 100644 index 0000000..92ba6fd --- /dev/null +++ b/boo1221868.patch @@ -0,0 +1,54 @@ +From a7fe0ab7cdf74ac73e4e3448e4fb29d4e7731f74 Mon Sep 17 00:00:00 2001 +From: Milan Crha +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 + diff --git a/evolution.changes b/evolution.changes index 34dfaac..5ce8fe9 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 4 14:20:03 UTC 2024 - M K + +- 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 diff --git a/evolution.spec b/evolution.spec index d030f18..23366c0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -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 URL: https://wiki.gnome.org/Apps/Evolution/ Source0: %{name}-%{version}.tar.zst +# PATCH-FIX-UPSTREAM boo1221868.patch glgo#GNOME/evolution#2712 +Patch0: boo1221868.patch BuildRequires: bison BuildRequires: bogofilter