From 3a318ed5908ad9acca318e6709ae6b16e5ffbba2 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Sun, 10 Dec 2006 04:33:55 +0000
Subject: sync etv 1.0.8

---
 x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'x11vnc/misc/enhanced_tightvnc_viewer/bin')

diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd b/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd
index 7aab487..6bc7303 100755
--- a/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd
+++ b/x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd
@@ -168,19 +168,19 @@ if [ ! -d "$dir/$name" -a $nearby = 0 ]; then
 	fi
 	echo "Using externel \"vncviewer\" and \"stunnel\" found in PATH."
 
-	if [ "X$DARWIN_COTVNC" = "X" -a "X$VNCVIEWERCMD" = "Xvncviewer" ]; then
-		hstr=`"$VNCVIEWERCMD" -h 2>&1 | head -5`
-		if echo "$hstr" | grep '^TightVNC.*version 1\.[23]' > /dev/null; then
-			# we need to avoid raw encoding
-			use_ours=1
-		fi
-	fi
 else
 	STUNNEL_EXTRA_OPTS=${STUNNEL_EXTRA_OPTS:-"maxconn = 1"}
 	export STUNNEL_EXTRA_OPTS
 	SSVNC_VIEWER_INTERNAL=1
 	export SSVNC_VIEWER_INTERNAL
-	use_ours=1
+fi
+
+if [ "X$DARWIN_COTVNC" = "X" -a "X$VNCVIEWERCMD" = "Xvncviewer" ]; then
+	hstr=`"$VNCVIEWERCMD" -h 2>&1 | head -5`
+	if echo "$hstr" | grep '^TightVNC.*version 1\.[23]' > /dev/null; then
+		# we need to avoid raw encoding
+		use_ours=1
+	fi
 fi
 
 # Put our os.arch and other utils dirs at head of PATH to be sure to
-- 
cgit v1.2.1