summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2009-04-03 14:33:51 +0000
committerAdam Tkac <atkac@redhat.com>2009-04-03 14:33:51 +0000
commit804d86f3b29299439fc48143fd4ca3d8ee34e93d (patch)
tree7c2bcdf7ac92126d5a80f6e1c6bc0c8ea72df674 /unix
parent430db3d48e1afbe050f3f1c791f49eed2471fa02 (diff)
downloadtigervnc-804d86f3b29299439fc48143fd4ca3d8ee34e93d.tar.gz
tigervnc-804d86f3b29299439fc48143fd4ca3d8ee34e93d.zip
Execute vncconfig in xstartup file early to make clipboard working.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3749 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
-rwxr-xr-xunix/vncserver2
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/vncserver b/unix/vncserver
index 405d0923..07c3bec5 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -55,6 +55,7 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority";
$defaultXStartup
= ("#!/bin/sh\n\n".
+ "vncconfig -iconic &\n".
"unset SESSION_MANAGER\n".
"OS=`uname -s`\n".
"if [ \$OS = 'Linux' ]; then\n".
@@ -75,7 +76,6 @@ $defaultXStartup
"fi\n".
"[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
"xsetroot -solid grey\n".
- "vncconfig -iconic &\n".
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
"twm &\n");