GtkApplication: Respect GTK_USE_PORTAL

When the environment variable is set, don't connect
to the session manager, but instead rely on the
inhibit portal.
This commit is contained in:
Matthias Clasen 2018-08-30 16:38:03 -04:00
parent f734c3d3b0
commit 3fc319ff1b

View File

@ -24,6 +24,7 @@
#include "gtkapplicationprivate.h" #include "gtkapplicationprivate.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkprivate.h"
G_DEFINE_TYPE (GtkApplicationImplDBus, gtk_application_impl_dbus, GTK_TYPE_APPLICATION_IMPL) G_DEFINE_TYPE (GtkApplicationImplDBus, gtk_application_impl_dbus, GTK_TYPE_APPLICATION_IMPL)
@ -195,6 +196,9 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl,
dbus->object_path = g_application_get_dbus_object_path (G_APPLICATION (impl->application)); dbus->object_path = g_application_get_dbus_object_path (G_APPLICATION (impl->application));
dbus->unique_name = g_dbus_connection_get_unique_name (dbus->session); dbus->unique_name = g_dbus_connection_get_unique_name (dbus->session);
if (gtk_should_use_portal ())
goto out;
g_debug ("Connecting to session manager"); g_debug ("Connecting to session manager");
/* Try the GNOME session manager first */ /* Try the GNOME session manager first */