application: Respect GDK_DEBUG=no-portals
If that debug flag is set, don't activate portals by talking to the Inhibit portal. Fixes: #7116
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user