commit 804d86f3b29299439fc48143fd4ca3d8ee34e93d
author Adam Tkac <atkac@redhat.com> Fri Apr 03 14:33:51 2009 +0000
committer Adam Tkac <atkac@redhat.com> Fri Apr 03 14:33:51 2009 +0000
tree 7c2bcdf7ac92126d5a80f6e1c6bc0c8ea72df674
parent 430db3d48e1afbe050f3f1c791f49eed2471fa02

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

unix/vncserver

diff --git a/unix/vncserver b/unix/vncserver
index 405d092..07c3bec 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -55,6 +55,7 @@
 
 $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 @@
        "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");