diff options
| -rw-r--r-- | cmake/FindFREERDP.cmake | 17 | ||||
| -rw-r--r-- | remmina-plugins/rdp/rdp_plugin.c | 20 |
2 files changed, 18 insertions, 19 deletions
diff --git a/cmake/FindFREERDP.cmake b/cmake/FindFREERDP.cmake index 9ff226e1a..b4767f05c 100644 --- a/cmake/FindFREERDP.cmake +++ b/cmake/FindFREERDP.cmake @@ -24,20 +24,29 @@ set(FREERDP_DEFINITIONS ${PC_FREERDP_CFLAGS_OTHER}) find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS}) -find_library(FREERDP_LIBRARY NAMES freerdp +find_library(FREERDP_LIBRARY NAMES freerdp-core HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) -find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client +find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi + HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) + +find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale + HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) + +find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail + HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) + +find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) -find_library(FREERDP_WINPR_LIBRARY NAMES winpr +find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR) -set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY} ${FREERDP_WINPR_LIBRARY} ) +set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CLIENT_LIBRARY}) set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR}) mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY) diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c index bc96f71e7..19ec3f613 100644 --- a/remmina-plugins/rdp/rdp_plugin.c +++ b/remmina-plugins/rdp/rdp_plugin.c @@ -49,6 +49,7 @@ #include <freerdp/client/channels.h> #include <freerdp/client/cmdline.h> #include <freerdp/error.h> +#include <freerdp/utils/signal.h> #include <winpr/memory.h> #define REMMINA_RDP_FEATURE_TOOL_REFRESH 1 @@ -256,7 +257,7 @@ static BOOL remmina_rdp_pre_connect(freerdp* instance) settings->LargePointerFlag = True; settings->PerformanceFlags = PERF_FLAG_NONE; - rfi->rfx_context = rfx_context_new(FALSE); + rfi->rfx_context = rfx_context_new(); } freerdp_client_load_addins(instance->context->channels, instance->settings); @@ -885,20 +886,7 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp) UINT32 e; e = freerdp_get_last_error(rfi->instance->context); - switch(e) { - case FREERDP_ERROR_AUTHENTICATION_FAILED: - remmina_plugin_service->protocol_plugin_set_error(gp, _("Authentication to RDP server %s failed.\nCheck username, password and domain."), - rfi->settings->ServerHostname ); - // Invalidate the saved password, so the user will be re-asked at next logon - remmina_plugin_service->file_unsave_password(remminafile); - break; - case FREERDP_ERROR_CONNECT_FAILED: - remmina_plugin_service->protocol_plugin_set_error(gp, _("Connection to RDP server %s failed."), rfi->settings->ServerHostname ); - break; - default: - remmina_plugin_service->protocol_plugin_set_error(gp, _("Unable to connect to RDP server %s"), rfi->settings->ServerHostname); - break; - } + remmina_plugin_service->protocol_plugin_set_error(gp, _("Unable to connect to RDP server %s"), rfi->settings->ServerHostname); } @@ -1212,6 +1200,8 @@ G_MODULE_EXPORT gboolean remmina_plugin_entry(RemminaPluginService* service) return FALSE; remmina_rdp_settings_init(); + freerdp_handle_signals(); + freerdp_channels_global_init(); return TRUE; } |