Merge branch 'wip/lantw/gapplication-remove-inactivity_timeout-source-on-finalize' into 'master'

gapplication: remove inactivity_timeout source on finalize

See merge request GNOME/glib!1009
This commit is contained in:
Philip Withnall 2019-07-29 09:50:39 +00:00
commit 014e8d0547

View File

@ -1373,6 +1373,9 @@ g_application_finalize (GObject *object)
{ {
GApplication *application = G_APPLICATION (object); GApplication *application = G_APPLICATION (object);
if (application->priv->inactivity_timeout_id)
g_source_remove (application->priv->inactivity_timeout_id);
g_slist_free_full (application->priv->option_groups, (GDestroyNotify) g_option_group_unref); g_slist_free_full (application->priv->option_groups, (GDestroyNotify) g_option_group_unref);
if (application->priv->main_options) if (application->priv->main_options)
g_option_group_unref (application->priv->main_options); g_option_group_unref (application->priv->main_options);