From 55608da0a0cf9b923716b9950863ec557d363b1d Mon Sep 17 00:00:00 2001 From: totaam Date: Thu, 25 May 2023 20:44:14 +0700 Subject: [PATCH] don't try to use Gtk.StatusIcon on wayland --- xpra/client/gtk_base/gtk_client_base.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xpra/client/gtk_base/gtk_client_base.py b/xpra/client/gtk_base/gtk_client_base.py index d0b7c09f80..6676384efa 100644 --- a/xpra/client/gtk_base/gtk_client_base.py +++ b/xpra/client/gtk_base/gtk_client_base.py @@ -794,14 +794,16 @@ def get_window_frame_sizes(self): def _add_statusicon_tray(self, tray_list): - #add Gtk.StatusIcon tray: - try: - from xpra.client.gtk_base.statusicon_tray import GTKStatusIconTray - tray_list.append(GTKStatusIconTray) - except Exception as e: - log.warn("failed to load StatusIcon tray: %s" % e) + #add Gtk.StatusIcon tray, but not under wayland: + if not is_Wayland(): + try: + from xpra.client.gtk_base.statusicon_tray import GTKStatusIconTray + tray_list.append(GTKStatusIconTray) + except Exception as e: + log.warn("failed to load StatusIcon tray: %s" % e) return tray_list + def get_tray_classes(self): from xpra.client.mixins.tray import TrayClient return self._add_statusicon_tray(TrayClient.get_tray_classes(self))