diff options
author | Ingo Klöcker <[email protected]> | 2021-08-02 15:19:45 +0000 |
---|---|---|
committer | Ingo Klöcker <[email protected]> | 2021-08-02 15:19:45 +0000 |
commit | 94d18320b2b0bb5e3fa2023df8ac57078b2f6ecb (patch) | |
tree | 2e99f577e0c62ba40dd0a7e5feb42e6b99c25378 /common/session-env.c | |
parent | sm,w32: Fix Unicode problem on key box creation. (diff) | |
download | gnupg-94d18320b2b0bb5e3fa2023df8ac57078b2f6ecb.tar.gz gnupg-94d18320b2b0bb5e3fa2023df8ac57078b2f6ecb.zip |
common: Pass XDG_SESSION_TYPE and QT_QPA_PLATFORM envvars to pinentry
* common/session-env.c (stdenvnames): Add XDG_SESSION_TYPE and
QT_QPA_PLATFORM.
--
On Unix systems (except Darwin), Qt uses those two environment
variables additionally to DISPLAY and WAYLAND_DISPLAY to figure out
whether to use X11 or Wayland. For example, QT_QPA_PLATFORM needs
to be set to "wayland" to make Qt use Wayland on Gnome.
GnuPG-bug-id: 3659
Diffstat (limited to 'common/session-env.c')
-rw-r--r-- | common/session-env.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/session-env.c b/common/session-env.c index 5d6b66dd6..f07d9d101 100644 --- a/common/session-env.c +++ b/common/session-env.c @@ -71,6 +71,11 @@ static struct { "XMODIFIERS" }, /* Used by Xlib to select X input modules (eg "@im=SCIM"). */ { "WAYLAND_DISPLAY" }, /* For the Wayland display engine. */ + { "XDG_SESSION_TYPE" }, /* Used by Qt and other non-GTK toolkits + to check for x11 or wayland. */ + { "QT_QPA_PLATFORM" }, /* Used by Qt to explicitly request + x11 or wayland; in particular, needed + to make Qt use Wayland on Gnome. */ { "GTK_IM_MODULE" }, /* Used by gtk to select gtk input modules (eg "scim-bridge"). */ { "DBUS_SESSION_BUS_ADDRESS" },/* Used by GNOME3 to talk to gcr over |