Skip to content

Commit

Permalink
#1925: don't try to use the x11 clipboard under wayland
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@22237 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 1, 2019
1 parent 1db4a99 commit 5874b0c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/xpra/platform/xposix/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# later version. See the file COPYING for details.

#don't bother trying to forward system tray with Ubuntu's "unity":
from xpra.os_util import is_unity
from xpra.os_util import is_unity, is_Wayland

SYSTEM_TRAY_SUPPORTED = not is_unity()

Expand All @@ -32,7 +32,11 @@

DEFAULT_SSH_CMD = "ssh"

CLIPBOARD_NATIVE_CLASS = "xpra.x11.gtk_x11.clipboard.X11Clipboard"
if is_Wayland():
CLIPBOARD_NATIVE_CLASS = None
else:
CLIPBOARD_NATIVE_CLASS = "xpra.x11.gtk_x11.clipboard.X11Clipboard"

CLIPBOARDS=["CLIPBOARD", "PRIMARY", "SECONDARY"]

OPEN_COMMAND = ["/usr/bin/xdg-open"]
Expand Down

0 comments on commit 5874b0c

Please sign in to comment.