Merge 1.6.0 changes back to patch.
This commit is contained in:
commit
e099f466d1
@ -658,7 +658,7 @@ if test "x${have_libvncserver}" = "xyes"
|
||||
then
|
||||
|
||||
have_vnc_size_msg=yes
|
||||
AC_CHECK_DECL([rfbSetDesktopSizeMsg],
|
||||
AC_CHECK_TYPE([rfbSetDesktopSizeMsg],
|
||||
[], [have_vnc_size_msg=no],
|
||||
[[#include <rfb/rfbproto.h>]])
|
||||
|
||||
|
||||
@ -284,15 +284,9 @@ void* guac_vnc_display_set_owner_size(guac_user* owner, void* data) {
|
||||
rfbClient* rfb_client = (rfbClient*) data;
|
||||
|
||||
guac_user_log(owner, GUAC_LOG_DEBUG, "Sending VNC display size for owner's display.");
|
||||
|
||||
#ifdef LIBVNC_CLIENT_HAS_SIZE_MSG
|
||||
guac_user_log(owner, GUAC_LOG_DEBUG, "Sending VNC display size for owner's display.");
|
||||
|
||||
/* Set the display size. */
|
||||
guac_vnc_display_set_size(rfb_client, owner->info.optimal_width, owner->info.optimal_height);
|
||||
#else
|
||||
guac_user_log(owner, GUAC_LOG_WARNING, "VNC client lacks support for sending display size.");
|
||||
#endif // LIBVNC_CLIENT_HAS_SIZE_MSG
|
||||
|
||||
/* Always return NULL. */
|
||||
return NULL;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user