diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/kwallet/src/kwallet_plugin_main.c | 10 | ||||
| -rw-r--r-- | plugins/rdp/rdp_plugin.c | 13 |
3 files changed, 17 insertions, 10 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index acb93e0..1aa0878 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -51,11 +51,13 @@ endif() option(WITH_FREERDP3 "Compile the RDP plugin using symbols from FreeRDP3" OFF) if (WITH_FREERDP3) + message(STATUS "Using FreeRDP3") set(FREERDP_REQUIRED_VERSION 3) set(FREERDP_REQUIRED_MAJOR 3) set(FREERDP_REQUIRED_MINOR 0) set(FREERDP_REQUIRED_REVISION 0) else() + message(STATUS "Using FreeRDP2") set(FREERDP_REQUIRED_VERSION 2) set(FREERDP_REQUIRED_MAJOR 2) set(FREERDP_REQUIRED_MINOR 0) @@ -68,7 +70,7 @@ find_package(FreeRDP-Client ${FREERDP_REQUIRED_VERSION} ) if (WinPR_FOUND AND FreeRDP_FOUND AND FreeRDP-Client_FOUND) - message("Enabling RDP plugin") + message(STATUS "Enabling RDP plugin") add_subdirectory(rdp) else() message(STATUS "Disabling RDP plugin.") diff --git a/plugins/kwallet/src/kwallet_plugin_main.c b/plugins/kwallet/src/kwallet_plugin_main.c index 6a6be3b..17dd3ca 100644 --- a/plugins/kwallet/src/kwallet_plugin_main.c +++ b/plugins/kwallet/src/kwallet_plugin_main.c @@ -44,7 +44,7 @@ static RemminaPluginService *remmina_plugin_service = NULL; -gboolean remmina_plugin_kwallet_is_service_available(RemminaPlugin *plugin) +gboolean remmina_plugin_kwallet_is_service_available(RemminaSecretPlugin *plugin) { return rp_kwallet_is_service_available(); } @@ -68,7 +68,7 @@ static gchar *build_kwallet_key(RemminaFile *remminafile, const gchar *key) return kwkey; } -void remmina_plugin_kwallet_store_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key, const gchar *password) +void remmina_plugin_kwallet_store_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key, const gchar *password) { TRACE_CALL(__func__); gchar *kwkey; @@ -78,7 +78,7 @@ void remmina_plugin_kwallet_store_password(RemminaPlugin *plugin, RemminaFile *r } gchar* -remmina_plugin_kwallet_get_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key) +remmina_plugin_kwallet_get_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key) { TRACE_CALL(__func__); gchar *kwkey, *password; @@ -90,7 +90,7 @@ remmina_plugin_kwallet_get_password(RemminaPlugin *plugin, RemminaFile *remminaf return password; } -void remmina_plugin_kwallet_delete_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key) +void remmina_plugin_kwallet_delete_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key) { TRACE_CALL(__func__); gchar *kwkey; @@ -99,7 +99,7 @@ void remmina_plugin_kwallet_delete_password(RemminaPlugin *plugin, RemminaFile * g_free(kwkey); } -gboolean remmina_plugin_kwallet_init(RemminaPlugin *plugin) +gboolean remmina_plugin_kwallet_init(RemminaSecretPlugin *plugin) { /* Activates only when KDE is running */ const gchar *envvar; diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index 68ea505..1e691ea 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -115,7 +115,9 @@ #if FREERDP_VERSION_MAJOR < 3 static HANDLE freerdp_abort_event(rdpContext* context) { +#ifdef WINPR_ASSERT WINPR_ASSERT(context); +#endif return context->abortEvent; } @@ -124,8 +126,9 @@ static BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, c switch(id) { case FreeRDP_LoadBalanceInfo: free(settings->LoadBalanceInfo); - settings->LoadBalanceInfo = _strdup(data); - settings->LoadBalanceInfoLength = len; + settings->LoadBalanceInfo = (BYTE *)data; + freerdp_settings_set_uint32(settings, FreeRDP_LoadBalanceInfoLength, strlen(data)); + return TRUE; default: return FALSE; @@ -133,7 +136,9 @@ static BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, size_t id, c } static void freerdp_abort_connect_context(rdpContext* context) { +#ifdef WINPR_ASSERT WINPR_ASSERT(context); +#endif freerdp_abort_connect(context->instance); } #endif @@ -1021,7 +1026,7 @@ static BOOL remmina_rdp_authenticate_ex(freerdp* instance, char** username, char key_title, remmina_plugin_service->file_get_string(remminafile, key_user), remmina_plugin_service->file_get_string(remminafile, key_password), - remmina_plugin_service->file_get_string(remminafile, disablepasswordstoring ? NULL : key_domain), + remmina_plugin_service->file_get_string(remminafile, key_domain), NULL); if (ret == GTK_RESPONSE_OK) { if (cfg_key_user != FreeRDP_STRING_UNUSED) @@ -1881,7 +1886,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget *gp) if (remmina_plugin_service->file_get_string(remminafile, "loadbalanceinfo")) { const gchar *tmp = strdup(remmina_plugin_service->file_get_string(remminafile, "loadbalanceinfo")); - freerdp_settings_set_pointer_len(rfi->clientContext.context.settings, FreeRDP_LoadBalanceInfo, tmp, strlen(tmp) + 1); + freerdp_settings_set_pointer_len(rfi->clientContext.context.settings, FreeRDP_LoadBalanceInfo, tmp, strlen(tmp)); } if (remmina_plugin_service->file_get_string(remminafile, "exec")) |