diff options
author | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
commit | d1cb31f43636e574058f64ac3e5e4cbe20f162b4 (patch) | |
tree | 1260ce593ca99b9fe22eb51b906f54b2c0f567fe /vncviewer/parameters.cxx | |
parent | 59b4bc5638ced3cb5f043ccd9ed207fe76148d1a (diff) | |
parent | 4cf2d3a621ecb9918b57021bc1cee1bd016dc0aa (diff) | |
download | tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.tar.gz tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.zip |
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc
Conflicts:
contrib/packages/rpm/el5/SPECS/tigervnc.spec
vncviewer/Viewport.cxx
Diffstat (limited to 'vncviewer/parameters.cxx')
-rw-r--r-- | vncviewer/parameters.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx index 7a868c7c..bf390103 100644 --- a/vncviewer/parameters.cxx +++ b/vncviewer/parameters.cxx @@ -92,14 +92,10 @@ IntParameter qualityLevel("QualityLevel", 8); BoolParameter maximize("Maximize", "Maximize viewer window", false); -#ifdef HAVE_FLTK_FULLSCREEN BoolParameter fullScreen("FullScreen", "Full screen mode", false); -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS BoolParameter fullScreenAllMonitors("FullScreenAllMonitors", "Enable full screen over all monitors", true); -#endif // HAVE_FLTK_FULLSCREEN_SCREENS -#endif // HAVE_FLTK_FULLSCREEN StringParameter desktopSize("DesktopSize", "Reconfigure desktop size on the server on " "connect (if possible)", ""); @@ -160,12 +156,8 @@ static VoidParameter* parameterArray[] = { &compressLevel, &noJpeg, &qualityLevel, -#ifdef HAVE_FLTK_FULLSCREEN &fullScreen, -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS &fullScreenAllMonitors, -#endif // HAVE_FLTK_FULLSCREEN_SCREENS -#endif // HAVE_FLTK_FULLSCREEN &desktopSize, &geometry, &remoteResize, |