Skip to content

Commit

Permalink
#3930 remove unprefixed legacy compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Sep 1, 2023
1 parent c7c09ee commit 21638d6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions xpra/client/mixins/clipboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ def get_caps(self) -> dict[str, Any]:
#buggy osx and win32 clipboards:
"greedy" : CLIPBOARD_GREEDY,
"preferred-targets" : CLIPBOARD_PREFERRED_TARGETS,
"set_enabled" : True, #v4 servers no longer use or show this flag
"contents-slice-fix" : True, #fixed in v2.4, removed check in v4.3
}
return {"clipboard" : caps}

Expand Down
10 changes: 1 addition & 9 deletions xpra/server/mixins/clipboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,13 @@ def get_server_features(self, server_source=None) -> dict[str,Any]:
ccaps = {
"notifications" : True,
"selections" : self._clipboards,
"enable-selections" : True, #client check removed in v4
"contents-slice-fix" : True, #fixed in v2.4, removed check in v4.3
"want_targets" : CLIPBOARD_WANT_TARGETS,
"greedy" : CLIPBOARD_GREEDY,
"preferred-targets" : CLIPBOARD_PREFERRED_TARGETS,
"set_enabled" : True, #v4 servers no longer use or show this flag
"direction" : self.clipboard_direction,
}
log("clipboard server caps=%s", ccaps)
return {
"clipboard" : ccaps,
#for versions older than v4.4, duplicated here without the namespace:
"clipboards" : self._clipboards,
"clipboard-direction" : self.clipboard_direction,
}
return {"clipboard" : ccaps}

def init_clipboard(self) -> None:
log("init_clipboard() enabled=%s, filter file=%s", self.clipboard, self.clipboard_filter_file)
Expand Down

0 comments on commit 21638d6

Please sign in to comment.