Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUACAMOLE-1026: Use LoadChannels callback method to load plugins with FreeRDP3. #546

Merged

Conversation

aleitner
Copy link
Contributor

@aleitner aleitner commented Sep 6, 2024

Plugins were not working properly when building Guacamole with FreeRDP3 due to a change in how they are loaded. This PR implements the LoadChannels callback function for loading plugins.

https://github.com/FreeRDP/FreeRDP/wiki/FreeRDP3-migration-notes

Channel loading has been moved from PreConnect to LoadChannels. This has a default implementation in client/common and only step required is removing calls to freerdp_client_load_addins

@aleitner aleitner changed the base branch from main to staging/1.6.0 September 6, 2024 16:52
@aleitner aleitner force-pushed the GUACAMOLE-1026-load-channels branch 2 times, most recently from 33b53f2 to ff7ca6d Compare September 6, 2024 16:55
* @return
* Always TRUE.
*/
BOOL rdp_freerdp_load_channels(freerdp* instance) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These (rdp_freerdp_load_channels and rdp_freerdp_pre_connect) should be declared as static if they're only used within this file.

@aleitner aleitner force-pushed the GUACAMOLE-1026-load-channels branch 4 times, most recently from 4d5373c to 2e7858e Compare September 6, 2024 21:41
* otherwise it can becalled directly from our pre_connect callback. It
* configures various features such as display resizing, multi-touch support,
* audio input, clipboard synchronization, device redirection, and graphics
* pipeline, by loading their correspondingplugins if they are enabled in the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing space: "correspondingplugins"

Copy link
Contributor

@jmuehlner jmuehlner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jmuehlner jmuehlner merged commit 08326a3 into apache:staging/1.6.0 Sep 9, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants