From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 4 Oct 2011 06:57:19 +0000 (+0000)
Subject: Always look for the Java classes in ../vnc/classes first before looking in the system... 
X-Git-Tag: v1.1.90~119
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e85eba53ac46926107dd4e443ad754cc8ebeee4a;p=tigervnc.git

Always look for the Java classes in ../vnc/classes first before looking in the system locations.  This prevents TigerVNC from picking up the Java classes from a RealVNC installation.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4691 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/vncserver b/unix/vncserver
index 689641f0..3d629ed5 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -48,9 +48,10 @@ $xauth = "xauth";
 
 $geometry = "1024x768";
 #$depth = 16;
-$vncJavaFiles = (((-d "/usr/share/vnc/classes") && "/usr/share/vnc/classes") ||
-                 ((-d "/usr/local/vnc/classes") && "/usr/local/vnc/classes") ||
-                 ((-d "$vncClasses") && "$vncClasses"));
+$vncJavaFiles = (((-d "$vncClasses") && "$vncClasses") ||
+                 ((-d "/usr/share/vnc/classes") && "/usr/share/vnc/classes") ||
+                 ((-d "/usr/local/vnc/classes") && "/usr/local/vnc/classes"));
+                 
 $vncUserDir = "$ENV{HOME}/.vnc";
 $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority";