Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'application-portal-use' into 'main'

Browse Source 
application: Respect GDK_DEBUG=no-portals

Closes #7116

See merge request GNOME/gtk!7867
This commit is contained in:
Matthias Clasen
2024-10-25 16:40:40 +00:00
parent 1a068bf76b f14c05dbb0
commit 3885f75bc6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkapplication-dbus.c
View File

@@ -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,