depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-11-17 07:46:03 +00:00
Code Issues Releases Wiki Activity

application: Remove and destroy application windows on shutdown

Browse source 
The windows need to be removed from the GtkApplication because they are
holding references to the application which prevents proper cleanup.

Fixes: #508
This commit is contained in:
Evangelos Ribeiro Tzaras 2023-01-11 18:50:22 +01:00
parent 177199467f
commit e878fabb27
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/calls-application.c
View file

@ -79,15 +79,25 @@ G_DEFINE_TYPE (CallsApplication, calls_application, GTK_TYPE_APPLICATION);
static void start_proper (CallsApplication *self); static void start_proper (CallsApplication *self);
static void
quit_calls (CallsApplication *self)
{
gtk_application_remove_window (GTK_APPLICATION (self), GTK_WINDOW (self->main_window));
gtk_application_remove_window (GTK_APPLICATION (self), GTK_WINDOW (self->call_window));
}
static gboolean static gboolean
on_int_or_term_signal (CallsApplication *self) on_int_or_term_signal (CallsApplication *self)
{ {
g_debug ("Received SIGTERM/SIGINT, shutting down gracefully"); g_debug ("Received SIGTERM/SIGINT, shutting down gracefully");
g_application_quit (G_APPLICATION (self));
self->id_sigint = 0; self->id_sigint = 0;
self->id_sigterm = 0; self->id_sigterm = 0;
quit_calls (self);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -676,8 +686,9 @@ finalize (GObject *object)
g_clear_handle_id (&self->id_sigterm, g_source_remove); g_clear_handle_id (&self->id_sigterm, g_source_remove);
g_clear_handle_id (&self->id_sigint, g_source_remove); g_clear_handle_id (&self->id_sigint, g_source_remove);
g_clear_object (&self->call_window); gtk_widget_destroy (GTK_WIDGET (self->main_window));
g_clear_object (&self->main_window); gtk_widget_destroy (GTK_WIDGET (self->call_window));
g_clear_object (&self->record_store); g_clear_object (&self->record_store);
g_clear_object (&self->ringer); g_clear_object (&self->ringer);
g_clear_object (&self->notifier); g_clear_object (&self->notifier);