You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2026/07/13 02:49:10 UTC
(guacamole-server) 01/01: Merge main branch changes to next.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 9dcef541be40b125e50a1f664a5273c6d4d55693
Merge: 3c7e8fe6 6ea04339
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sun Jul 12 22:48:44 2026 -0400
Merge main branch changes to next.
src/common-ssh/Makefile.am | 2 ++
src/common-ssh/buffer.c | 2 --
src/common-ssh/key.c | 2 --
src/common-ssh/tests/Makefile.am | 2 ++
src/common/Makefile.am | 2 ++
src/common/blank_cursor.c | 2 --
src/common/clipboard.c | 1 -
src/common/dot_cursor.c | 2 --
src/common/ibar_cursor.c | 2 --
src/common/iconv.c | 1 -
src/common/io.c | 1 -
src/common/json.c | 2 --
src/common/list.c | 1 -
src/common/pointer_cursor.c | 2 --
src/common/rect.c | 1 -
src/common/string.c | 2 --
src/common/surface.c | 1 -
src/common/tests/Makefile.am | 2 ++
src/guacd/Makefile.am | 2 ++
src/guacd/conf-args.c | 2 --
src/guacd/conf-file.c | 2 --
src/guacd/conf-parse.c | 2 --
src/guacd/connection.c | 2 --
src/guacd/daemon.c | 2 --
src/guacd/log.c | 1 -
src/guacd/move-fd.c | 1 -
src/guacd/proc-map.c | 1 -
src/guacd/proc.c | 2 --
src/guacenc/Makefile.am | 2 ++
src/guacenc/buffer.c | 1 -
src/guacenc/cursor.c | 1 -
src/guacenc/display-buffers.c | 1 -
src/guacenc/display-flatten.c | 1 -
src/guacenc/display-image-streams.c | 1 -
src/guacenc/display-layers.c | 1 -
src/guacenc/display-sync.c | 1 -
src/guacenc/display.c | 1 -
src/guacenc/encode.c | 1 -
src/guacenc/ffmpeg-compat.c | 1 -
src/guacenc/guacenc.c | 2 --
src/guacenc/image-stream.c | 1 -
src/guacenc/instruction-blob.c | 1 -
src/guacenc/instruction-cfill.c | 1 -
src/guacenc/instruction-copy.c | 1 -
src/guacenc/instruction-cursor.c | 1 -
src/guacenc/instruction-dispose.c | 1 -
src/guacenc/instruction-end.c | 1 -
src/guacenc/instruction-img.c | 1 -
src/guacenc/instruction-mouse.c | 1 -
src/guacenc/instruction-move.c | 1 -
src/guacenc/instruction-rect.c | 1 -
src/guacenc/instruction-shade.c | 1 -
src/guacenc/instruction-size.c | 1 -
src/guacenc/instruction-sync.c | 1 -
src/guacenc/instruction-transfer.c | 1 -
src/guacenc/instructions.c | 1 -
src/guacenc/jpeg.c | 1 -
src/guacenc/layer.c | 1 -
src/guacenc/log.c | 1 -
src/guacenc/parse.c | 2 --
src/guacenc/png.c | 1 -
src/guacenc/video.c | 1 -
src/guacenc/webp.c | 1 -
src/guaclog/Makefile.am | 2 ++
src/guaclog/guaclog.c | 2 --
src/guaclog/instruction-key.c | 1 -
src/guaclog/instructions.c | 1 -
src/guaclog/interpret.c | 1 -
src/guaclog/keydef.c | 9 ++++-----
src/guaclog/log.c | 1 -
src/guaclog/state.c | 1 -
src/libguac/Makefile.am | 2 ++
src/libguac/argv.c | 2 --
src/libguac/audio.c | 2 --
src/libguac/client.c | 2 --
src/libguac/display-render-thread.c | 1 -
src/libguac/display.c | 11 ++++++++---
src/libguac/encode-jpeg.c | 2 --
src/libguac/encode-png.c | 2 --
src/libguac/encode-webp.c | 2 --
src/libguac/error.c | 2 --
src/libguac/fips.c | 1 -
src/libguac/hash.c | 2 --
src/libguac/id.c | 2 --
src/libguac/palette.c | 2 --
src/libguac/parser.c | 2 --
src/libguac/pool.c | 2 --
src/libguac/proctitle.c | 2 --
src/libguac/protocol.c | 2 --
src/libguac/raw_encoder.c | 2 --
src/libguac/socket-broadcast.c | 2 --
src/libguac/socket-fd.c | 1 -
src/libguac/socket-nest.c | 2 --
src/libguac/socket-ssl.c | 2 --
src/libguac/socket-tee.c | 2 --
src/libguac/socket.c | 1 -
src/libguac/string.c | 19 ++++++++++---------
src/libguac/tcp.c | 1 -
src/libguac/tests/Makefile.am | 2 ++
src/libguac/timestamp.c | 2 --
src/libguac/unicode.c | 2 --
src/libguac/user-handlers.c | 2 --
src/libguac/user-handshake.c | 2 --
src/libguac/user.c | 2 --
src/libguac/wait-fd.c | 2 --
src/libguac/wol.c | 1 -
src/protocols/kubernetes/Makefile.am | 2 ++
src/protocols/kubernetes/argv.c | 1 -
src/protocols/kubernetes/kubernetes.c | 2 --
src/protocols/kubernetes/tests/Makefile.am | 2 ++
src/protocols/rdp/Makefile.am | 2 ++
src/protocols/rdp/argv.c | 1 -
src/protocols/rdp/channels/cliprdr.c | 1 -
src/protocols/rdp/channels/disp.c | 2 --
src/protocols/rdp/channels/rail.c | 2 --
src/protocols/rdp/client.c | 1 -
src/protocols/rdp/color.c | 1 -
src/protocols/rdp/input-queue.c | 2 --
src/protocols/rdp/input.c | 2 --
src/protocols/rdp/keyboard.c | 2 --
.../rdp/plugins/guac-common-svc/guac-common-svc.c | 1 -
src/protocols/rdp/plugins/guacai/guacai.c | 2 --
src/protocols/rdp/rdp.c | 3 ---
src/protocols/rdp/settings.c | 1 -
src/protocols/rdp/sftp.c | 2 --
src/protocols/rdp/tests/Makefile.am | 2 ++
src/protocols/rdp/user.c | 1 -
src/protocols/ssh/Makefile.am | 2 ++
src/protocols/ssh/argv.c | 1 -
src/protocols/ssh/client.c | 2 --
src/protocols/ssh/clipboard.c | 1 -
src/protocols/ssh/input.c | 2 --
src/protocols/ssh/pipe.c | 1 -
src/protocols/ssh/settings.c | 2 --
src/protocols/ssh/sftp.c | 2 --
src/protocols/ssh/ssh.c | 2 --
src/protocols/ssh/ssh_agent.c | 2 --
src/protocols/ssh/ttymode.c | 1 -
src/protocols/ssh/user.c | 2 --
src/protocols/telnet/Makefile.am | 2 ++
src/protocols/telnet/argv.c | 1 -
src/protocols/telnet/client.c | 1 -
src/protocols/telnet/clipboard.c | 1 -
src/protocols/telnet/input.c | 1 -
src/protocols/telnet/pipe.c | 1 -
src/protocols/telnet/settings.c | 2 --
src/protocols/telnet/telnet.c | 2 --
src/protocols/telnet/user.c | 2 --
src/protocols/vnc/Makefile.am | 2 ++
src/protocols/vnc/argv.c | 1 -
src/protocols/vnc/auth.c | 2 --
src/protocols/vnc/client.c | 2 --
src/protocols/vnc/clipboard.c | 1 -
src/protocols/vnc/cursor.c | 2 --
src/protocols/vnc/display.c | 2 --
src/protocols/vnc/input.c | 2 --
src/protocols/vnc/log.c | 2 --
src/protocols/vnc/settings.c | 2 --
src/protocols/vnc/sftp.c | 2 --
src/protocols/vnc/user.c | 2 --
src/protocols/vnc/vnc.c | 2 --
src/pulse/Makefile.am | 2 ++
src/pulse/pulse.c | 2 --
src/terminal/Makefile.am | 2 ++
src/terminal/display.c | 2 --
src/terminal/named-colors.c | 2 +-
src/terminal/terminal-handlers.c | 2 --
src/terminal/terminal.c | 2 --
src/terminal/tests/Makefile.am | 2 ++
169 files changed, 61 insertions(+), 240 deletions(-)