From f6b584010328c2544ee3b1b1cfdf1f27f1cf7352 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 5 Oct 2011 21:28:03 +0000 Subject: [PATCH] Launch vncconfig directly from vncserver, not from xstartup. Justification: vncconfig is necessary to enable basic functionality of the TigerVNC system (clipboard transfer, most notably.) It isn't always going to be in the PATH, and in fact, there might be more than one version of it on the system (for instance, a version from RealVNC in /usr/bin and a version from TigerVNC in /opt/TigerVNC/bin.) If it is desirable to disable vncconfig under certain circumstances, then I would suggest adding a command-line option to vncserver to accomplish that. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4709 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/vncserver | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unix/vncserver b/unix/vncserver index 3d629ed5..85140350 100755 --- a/unix/vncserver +++ b/unix/vncserver @@ -57,7 +57,6 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority"; $defaultXStartup = ("#!/bin/sh\n\n". - "vncconfig -iconic &\n". "unset SESSION_MANAGER\n". "unset DBUS_SESSION_BUS_ADDRESS\n". "OS=`uname -s`\n". @@ -338,6 +337,8 @@ if (-e "/tmp/.X11-unix/X$displayNumber" || } $ENV{VNCDESKTOP}= $desktopName; +system($exedir."vncconfig -iconic >> " . "edString($desktopLog) . " 2>&1 &"); + if ($opt{'-fg'}) { system("$vncUserDir/xstartup >> " . "edString($desktopLog) . " 2>&1"); if (kill 0, `cat $pidFile`) { -- 2.39.5