Skip to content

Commit

Permalink
encodings mixin must be after windows mixin so it can assume that 'se…
Browse files Browse the repository at this point in the history
…lf.send_windows' is set

git-svn-id: https://xpra.org/svn/Xpra/trunk@19363 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 22, 2018
1 parent 001cc53 commit f472ca2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/xpra/server/source/client_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit f472ca2

Please sign in to comment.