sync etv 1.0.8

x11vnc/misc/enhanced_tightvnc_viewer/README

@@ -64,6 +64,8 @@ The enhanced TightVNC viewer features are:
 	- Automatic SSH connections from the GUI (ssh must already be
 	  installed on Unix; bundled plink is used on Windows)
 
+	- Ability to Save and Load VNC profiles for different hosts.
+
 	- Create or Import SSL Certificates and Private Keys.
 
 	- Automatic Service tunnelling via SSH for CUPS and SMB Printing,
@@ -124,11 +126,6 @@ Unix and Mac OS X:
 
         % ./ssvnc/MacOSX/ssvnc             (for Mac OS X)
 
-    actually both of the above are equivalent, and the same as running
-
-        % ./ssvnc/bin/ssvnc
-
-
     The smaller file "ssvnc_no_windows-1.0.8.tar.gz"
     could have been used as well.
 

x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd

@@ -168,20 +168,20 @@ 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
+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
 # pick them up: