Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/calendar-monitor: Join view thread in dispose

Browse Source 
Joining the calendar view thread in finalize is too late; dispose
is an earlier phase, and recoverable.

Do that.

Closes: https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/1085
This commit is contained in:
Georges Basile Stavracas Neto
2023-08-25 17:18:16 -03:00
parent d8742df706
commit f6c4fe108d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/gcal-calendar-monitor.c
+12 -1
View File
@@ -1234,7 +1234,7 @@ complete_in_idle_cb (gpointer user_data)
*/
static void
gcal_calendar_monitor_finalize (GObject *object)
gcal_calendar_monitor_dispose (GObject *object)
{
GcalCalendarMonitor *self = (GcalCalendarMonitor *)object;
@@ -1249,6 +1249,16 @@ gcal_calendar_monitor_finalize (GObject *object)
remove_all_events (self);
g_clear_object (&self->cancellable);
G_OBJECT_CLASS (gcal_calendar_monitor_parent_class)->dispose (object);
}
static void
gcal_calendar_monitor_finalize (GObject *object)
{
GcalCalendarMonitor *self = (GcalCalendarMonitor *)object;
g_clear_object (&self->calendar);
g_clear_pointer (&self->thread_context, g_main_context_unref);
g_clear_pointer (&self->main_context, g_main_context_unref);
@@ -1313,6 +1323,7 @@ gcal_calendar_monitor_class_init (GcalCalendarMonitorClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = gcal_calendar_monitor_dispose;
object_class->finalize = gcal_calendar_monitor_finalize;
object_class->get_property = gcal_calendar_monitor_get_property;
object_class->set_property = gcal_calendar_monitor_set_property;