This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit e724d033f8175a06e2a974f05e354cf394865e58 Merge: 212b0abf 2a1698b3 Author: Virtually Nick <[email protected]> AuthorDate: Sun Feb 25 18:07:18 2024 -0500 Merge 1.5.5 changes back to master. bin/guacctl | 1 - configure.ac | 2 -- src/common-ssh/key.c | 1 - src/common/common/cursor.h | 1 - src/common/common/defaults.h | 1 - src/common/common/dot_cursor.h | 1 - src/common/common/pointer_cursor.h | 1 - src/common/cursor.c | 1 - src/common/surface.c | 1 - src/guacd/log.h | 1 - src/guacd/move-fd.c | 1 - src/guacd/proc-map.h | 1 - src/guacenc/ffmpeg-compat.c | 1 - src/guacenc/parse.h | 1 - src/libguac/error.c | 6 +++--- src/libguac/guacamole/audio.h | 1 - src/libguac/guacamole/error-types.h | 10 +++++++++- src/libguac/guacamole/error.h | 1 - src/libguac/guacamole/hash.h | 1 - src/libguac/guacamole/parser-types.h | 1 - src/libguac/guacamole/parser.h | 1 - src/libguac/guacamole/socket-ssl.h | 1 - src/libguac/guacamole/unicode.h | 1 - src/libguac/id.c | 1 - src/libguac/palette.h | 1 - src/libguac/raw_encoder.h | 1 - src/libguac/tests/Makefile.am | 1 - src/libguac/user-handlers.h | 1 - src/protocols/kubernetes/argv.h | 1 - src/protocols/kubernetes/io.c | 1 - src/protocols/kubernetes/io.h | 1 - src/protocols/kubernetes/pipe.h | 1 - src/protocols/rdp/argv.h | 1 - src/protocols/rdp/channels/cliprdr.c | 1 - src/protocols/rdp/channels/pipe-svc.c | 1 - src/protocols/rdp/channels/rdpdr/rdpdr.c | 1 - src/protocols/rdp/gdi.c | 1 + src/protocols/rdp/keymaps/hu_hu_qwertz.keymap | 3 --- src/protocols/rdp/keymaps/tr_tr_qwerty.keymap | 1 - src/protocols/rdp/settings.c | 1 - src/protocols/ssh/argv.h | 1 - src/protocols/ssh/client.c | 1 - src/protocols/ssh/pipe.h | 1 - src/protocols/ssh/sftp.h | 1 - src/protocols/ssh/ssh.c | 1 - src/protocols/ssh/ssh_agent.h | 1 - src/protocols/telnet/argv.h | 1 - src/protocols/telnet/pipe.h | 1 - src/protocols/vnc/client.h | 1 - src/protocols/vnc/input.h | 1 - src/protocols/vnc/settings.h | 1 - src/pulse/pulse/pulse.h | 1 - src/terminal/buffer.c | 1 - src/terminal/char-mappings.c | 1 - src/terminal/color-scheme.c | 1 - src/terminal/display.c | 2 -- src/terminal/select.c | 1 - src/terminal/terminal-handlers.c | 1 - src/terminal/terminal.c | 2 -- src/terminal/terminal/buffer.h | 3 --- src/terminal/terminal/char-mappings.h | 2 -- src/terminal/terminal/color-scheme.h | 1 - src/terminal/terminal/common.h | 1 - src/terminal/terminal/display.h | 2 -- src/terminal/terminal/palette.h | 1 - src/terminal/terminal/scrollbar.h | 1 - src/terminal/terminal/select.h | 1 - src/terminal/terminal/terminal-handlers.h | 1 - src/terminal/terminal/terminal-priv.h | 1 - src/terminal/terminal/terminal.h | 1 - src/terminal/terminal/types.h | 1 - src/terminal/terminal/typescript.h | 2 -- src/terminal/terminal/xparsecolor.h | 1 - src/terminal/xparsecolor.c | 1 - 74 files changed, 13 insertions(+), 85 deletions(-) diff --cc src/protocols/rdp/gdi.c index aeb7c5a2,9c61772b..6fc311bf --- a/src/protocols/rdp/gdi.c +++ b/src/protocols/rdp/gdi.c @@@ -492,7 -391,7 +492,8 @@@ BOOL guac_rdp_gdi_desktop_resize(rdpCon guac_rdp_get_width(context->instance), guac_rdp_get_height(context->instance)); - return TRUE; + return gdi_resize(context->gdi, guac_rdp_get_width(context->instance), + guac_rdp_get_height(context->instance)); } + diff --cc src/terminal/terminal.c index 539d1e94,60dff20f..8877dc79 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@@ -17,10 -17,8 +17,9 @@@ * under the License. */ - #include "common/clipboard.h" #include "common/cursor.h" +#include "common/iconv.h" #include "terminal/buffer.h" #include "terminal/color-scheme.h" #include "terminal/common.h"
