From: Brian Hinz Date: Sat, 11 Jan 2014 23:30:50 +0000 (+0000) Subject: r5142 and r5149 borrowed code from the TurboVNC viewer, which has different Configura... X-Git-Tag: v1.3.90~68 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94896e56d2367d28c87281acb5d1a575cdf6de02;p=tigervnc.git r5142 and r5149 borrowed code from the TurboVNC viewer, which has different Configuration parameter logic. This caused an exception in the usage() method git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5156 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index 87820e3c..2cb3f426 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -480,17 +480,18 @@ public class VncViewer extends javax.swing.JApplet exit(0); } - // On Mac systems, setting this parameter will force the use of the old - // (pre-Lion) full-screen mode, even if the viewer is running on OS X 10.7 - // "Lion" or later. static BoolParameter noLionFS - = new BoolParameter("NoLionFS", null, false); + = new BoolParameter("NoLionFS", + "On Mac systems, setting this parameter will force the use of the old "+ + "(pre-Lion) full-screen mode, even if the viewer is running on OS X 10.7 "+ + "Lion or later.", + false); BoolParameter embed = new BoolParameter("Embed", "If the viewer is being run as an applet, display its output to " + "an embedded frame in the browser window rather than to a dedicated " + - "window. This also has the effect of setting FullScreen=0, and Scale=100.", + "window. Embed=1 implies FullScreen=0 and Scale=100.", false); BoolParameter useLocalCursor