PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
106 lines
3.7 KiB
Diff
106 lines
3.7 KiB
Diff
Patch-Source: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6180
|
|
https://gitlab.gnome.org/GNOME/gtk/-/issues/5775
|
|
--
|
|
From 7ca33ff9941ad8565979eb0873c8bc14e31397d2 Mon Sep 17 00:00:00 2001
|
|
From: Luca Bacci <luca.bacci982@gmail.com>
|
|
Date: Tue, 11 Jul 2023 10:33:08 +0200
|
|
Subject: [PATCH] GtkApplicationImplDBus: Cancel DBus method calls on shutdown
|
|
|
|
We do that for method calls where a non-NULL GAsyncReadyCallback
|
|
is passed.
|
|
|
|
Fixes #5775
|
|
---
|
|
gtk/gtkapplication-dbus.c | 21 +++++++++++++++------
|
|
gtk/gtkapplicationprivate.h | 1 +
|
|
2 files changed, 16 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
|
|
index 2c9a1a78efb..a663aede49b 100644
|
|
--- a/gtk/gtkapplication-dbus.c
|
|
+++ b/gtk/gtkapplication-dbus.c
|
|
@@ -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);
|
|
}
|
|
diff --git a/gtk/gtkapplicationprivate.h b/gtk/gtkapplicationprivate.h
|
|
index 01b674a709a..c76b2e8840f 100644
|
|
--- a/gtk/gtkapplicationprivate.h
|
|
+++ b/gtk/gtkapplicationprivate.h
|
|
@@ -117,6 +117,7 @@ typedef struct
|
|
GtkApplicationImpl impl;
|
|
|
|
GDBusConnection *session;
|
|
+ GCancellable *cancellable;
|
|
|
|
const gchar *application_id;
|
|
const gchar *unique_name;
|
|
--
|
|
GitLab
|
|
|