From f472ca2883f3a6edfab1287568810e53c33d4d63 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 22 May 2018 07:07:20 +0000 Subject: [PATCH] encodings mixin must be after windows mixin so it can assume that 'self.send_windows' is set git-svn-id: https://xpra.org/svn/Xpra/trunk@19363 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/server/source/client_connection.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/xpra/server/source/client_connection.py b/src/xpra/server/source/client_connection.py index 012a03ab63..4ecc0d1903 100644 --- a/src/xpra/server/source/client_connection.py +++ b/src/xpra/server/source/client_connection.py @@ -50,9 +50,6 @@ if server_features.dbus: from xpra.server.source.dbus_mixin import DBUS_Mixin CC_BASES.append(DBUS_Mixin) -if server_features.encoding: - from xpra.server.source.encodings_mixin import EncodingsMixin - CC_BASES.append(EncodingsMixin) if server_features.network_state: from xpra.server.source.networkstate_mixin import NetworkStateMixin CC_BASES.append(NetworkStateMixin) @@ -65,6 +62,10 @@ if server_features.windows: from xpra.server.source.windows_mixin import WindowsMixin CC_BASES.append(WindowsMixin) + #must be after windows mixin so it can assume "self.send_windows" is set + if server_features.encoding: + from xpra.server.source.encodings_mixin import EncodingsMixin + CC_BASES.append(EncodingsMixin) from xpra.server.source.idle_mixin import IdleMixin CC_BASES.append(IdleMixin) CC_BASES = tuple(CC_BASES)