callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-issue-5775' into 'gtk-3-24'

Browse Source 
GtkApplicationImplDBus: Cancel DBus method calls on shutdown

See merge request GNOME/gtk!6180
This commit is contained in:
Matthias Clasen 2023-07-22 23:47:36 +00:00
commit 0f717ca423
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkapplication-dbus.c
View File

@ -248,8 +248,10 @@ ss_get_active_cb (GObject *source,
ret = g_dbus_proxy_call_finish (proxy, result, &error);
if (ret == NULL)
{
g_warning ("Getting screensaver status failed: %s", error->message);
g_error_free (error);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("Getting screensaver status failed: %s",
error ? error->message : "");
g_clear_error (&error);
return;
}
@ -270,8 +272,10 @@ create_monitor_cb (GObject *source,
ret = g_dbus_proxy_call_finish (proxy, result, &error);
if (ret == NULL)
{
g_warning ("Creating a portal monitor failed: %s", error->message);
g_error_free (error);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("Creating a portal monitor failed: %s",
error ? error->message : "");
g_clear_error (&error);
return;
}
@ -302,6 +306,8 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
if (gtk_should_use_portal ())
goto out;
dbus->cancellable = g_cancellable_new ();
g_debug ("Connecting to session manager");
/* Try the GNOME session manager first */
@ -368,7 +374,7 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
NULL,
G_DBUS_CALL_FLAGS_NONE,
G_MAXINT,
NULL,
dbus->cancellable,
ss_get_active_cb,
dbus);
}
@ -515,7 +521,7 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
g_variant_new ("(sa{sv})", "", &opt_builder),
G_DBUS_CALL_FLAGS_NONE,
G_MAXINT,
NULL,
dbus->cancellable,
create_monitor_cb, dbus);
g_free (token);
}
@ -527,6 +533,8 @@ end:;
static void
gtk_application_impl_dbus_shutdown (GtkApplicationImpl *impl)
{
GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) impl;
g_cancellable_cancel (dbus->cancellable);
}
GQuark gtk_application_impl_dbus_export_id_quark (void);
@ -902,6 +910,7 @@ gtk_application_impl_dbus_finalize (GObject *object)
if (dbus->ss_proxy)
g_signal_handlers_disconnect_by_func (dbus->ss_proxy, screensaver_signal_session, dbus->impl.application);
g_clear_object (&dbus->ss_proxy);
g_clear_object (&dbus->cancellable);
G_OBJECT_CLASS (gtk_application_impl_dbus_parent_class)->finalize (object);
}

1
gtk/gtkapplicationprivate.h
View File

@ -117,6 +117,7 @@ typedef struct
GtkApplicationImpl impl;
GDBusConnection *session;
GCancellable *cancellable;
const gchar *application_id;
const gchar *unique_name;