From f14c05dbb0cbf2f7debab537da156197e1fe5d82 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 25 Oct 2024 10:24:37 -0400 Subject: [PATCH] application: Respect GDK_DEBUG=no-portals If that debug flag is set, don't activate portals by talking to the Inhibit portal. Fixes: #7116 --- gtk/gtkapplication-dbus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c index e79a31149b..18f2d8eb64 100644 --- a/gtk/gtkapplication-dbus.c +++ b/gtk/gtkapplication-dbus.c @@ -334,7 +334,10 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl, dbus->unique_name = g_dbus_connection_get_unique_name (dbus->session); if (gdk_should_use_portal ()) - goto out; + { + g_debug ("Not using session manager"); + goto out; + } dbus->cancellable = g_cancellable_new (); @@ -509,7 +512,7 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl, "gtk-shell-shows-menubar", FALSE, NULL); - if (dbus->sm_proxy == NULL && dbus->session) + if (dbus->sm_proxy == NULL && dbus->session != NULL && gdk_should_use_portal ()) { dbus->inhibit_proxy = gtk_application_get_proxy_if_service_present (dbus->session, G_DBUS_PROXY_FLAGS_NONE,