Skip to content

Commit

Permalink
#1761 minor fixes for clipboard mixin move
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@18542 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 23, 2018
1 parent bef8efc commit 58fe000
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions src/xpra/server/mixins/clipboard_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,18 @@ def init(self, opts):
def setup(self, _opts):
self.init_clipboard()

def threaded_setup(self):
pass

def cleanup(self):
pass


def get_info(self):
if self._clipboard_helper is None:
return {}
return self._clipboard_helper.get_info()

def get_caps(self):
return {
}
Expand Down Expand Up @@ -174,11 +182,6 @@ def send_clipboard_packet(self, *parts):
if self._clipboard_client:
self._clipboard_client.send_clipboard(parts)

def get_clipboard_info(self):
if self._clipboard_helper is None:
return {}
return self._clipboard_helper.get_info()


def init_packet_handlers(self):
self._authenticated_packet_handlers.update({
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/server/server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
bandwidthlog = Logger("bandwidth")
timeoutlog = Logger("timeout")

from xpra.platform.features import COMMAND_SIGNALS, CLIPBOARDS
from xpra.platform.features import COMMAND_SIGNALS
from xpra.keyboard.mask import DEFAULT_MODIFIER_MEANINGS
from xpra.server.server_core import ServerCore, get_thread_info
from xpra.server.mixins.server_base_controlcommands import ServerBaseControlCommands
Expand Down

0 comments on commit 58fe000

Please sign in to comment.