summaryrefslogtreecommitdiffstats
path: root/x11vnc/misc
diff options
context:
space:
mode:
authorrunge <runge>2006-12-10 04:33:55 +0000
committerrunge <runge>2006-12-10 04:33:55 +0000
commit3a318ed5908ad9acca318e6709ae6b16e5ffbba2 (patch)
tree2cf1c56a2d3dc9249caa5a505b5073345effab64 /x11vnc/misc
parent5b198763c597459a27e7e88827dcc748b98b6670 (diff)
downloadlibtdevnc-3a318ed5908ad9acca318e6709ae6b16e5ffbba2.tar.gz
libtdevnc-3a318ed5908ad9acca318e6709ae6b16e5ffbba2.zip
sync etv 1.0.8
Diffstat (limited to 'x11vnc/misc')
-rw-r--r--x11vnc/misc/enhanced_tightvnc_viewer/README7
-rwxr-xr-xx11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc_cmd16
2 files changed, 10 insertions, 13 deletions
diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/README b/x11vnc/misc/enhanced_tightvnc_viewer/README
index 8eaab87..ede14d7 100644
--- a/x11vnc/misc/enhanced_tightvnc_viewer/README
+++ b/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.
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