Merge remote-tracking branch 'origin/pr/310'

marmarek · marmarek · commit 100f88a56605 · 2024-10-27T03:32:03.000+01:00
* origin/pr/310:
  Add `max_clipboard_size` GUI Daemon option
diff --git a/qubesadmin/tools/qvm_start_daemon.py b/qubesadmin/tools/qvm_start_daemon.py
@@ -54,6 +54,7 @@
     ('trayicon_mode', 'str'),
     ('window_background_color', 'str'),
     ('startup_timeout', 'int'),
+    ('max_clipboard_size', 'int'),
 ]
 
 formatter = logging.Formatter(

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`('trayicon_mode', 'str'),`
`55`	`55`	`('window_background_color', 'str'),`
`56`	`56`	`('startup_timeout', 'int'),`
	`57`	`+ ('max_clipboard_size', 'int'),`
`57`	`58`	`]`
`58`	`59`
`59`	`60`	`formatter = logging.Formatter(`