diff options
author | Antenore Gatta <antenore@simbiosi.org> | 2017-10-25 23:56:53 +0300 |
---|---|---|
committer | Antenore Gatta <antenore@simbiosi.org> | 2017-10-25 23:56:53 +0300 |
commit | bf34393e25761fa17fbe7a28e6037aae9ab7eab0 (patch) | |
tree | 398b9831dd5caff41aab60e7b6e4905542d362c8 /remmina-plugins | |
parent | 7ec707e533336a733c85b31e946b6de002937d60 (diff) | |
parent | 73bfd1ea9bb3e051bdd5e8e17a7536bed72d842a (diff) |
Merging from next
Diffstat (limited to 'remmina-plugins')
-rw-r--r-- | remmina-plugins/nx/nx_plugin.c | 4 | ||||
-rw-r--r-- | remmina-plugins/rdp/rdp_file.c | 10 | ||||
-rw-r--r-- | remmina-plugins/rdp/rdp_plugin.c | 10 | ||||
-rw-r--r-- | remmina-plugins/xdmcp/xdmcp_plugin.c | 8 |
4 files changed, 14 insertions, 18 deletions
diff --git a/remmina-plugins/nx/nx_plugin.c b/remmina-plugins/nx/nx_plugin.c index 9437ef745..67d21d165 100644 --- a/remmina-plugins/nx/nx_plugin.c +++ b/remmina-plugins/nx/nx_plugin.c @@ -477,8 +477,8 @@ static gboolean remmina_plugin_nx_start_session(RemminaProtocolWidget *gp) i = remmina_plugin_nx_service->file_get_int(remminafile, "quality", 0); remmina_nx_session_add_parameter(nx, "link", i > 2 ? "lan" : i == 2 ? "adsl" : i == 1 ? "isdn" : "modem"); remmina_nx_session_add_parameter(nx, "geometry", "%ix%i", - remmina_plugin_nx_service->file_get_int(remminafile, "resolution_width", 0), - remmina_plugin_nx_service->file_get_int(remminafile, "resolution_height", 0)); + remmina_plugin_nx_service->get_profile_remote_width(gp), + remmina_plugin_nx_service->get_profile_remote_height(gp)); remmina_nx_session_add_parameter(nx, "keyboard", remmina_kbtype); remmina_nx_session_add_parameter(nx, "client", "linux"); remmina_nx_session_add_parameter(nx, "media", "0"); diff --git a/remmina-plugins/rdp/rdp_file.c b/remmina-plugins/rdp/rdp_file.c index 89ae52bdc..ed9122586 100644 --- a/remmina-plugins/rdp/rdp_file.c +++ b/remmina-plugins/rdp/rdp_file.c @@ -230,16 +230,6 @@ static RemminaFile* remmina_rdp_file_import_channel(GIOChannel* channel) g_free(line); } - if (remmina_plugin_service->file_get_int(remminafile, "resolution_width", 0) > 0 && - remmina_plugin_service->file_get_int(remminafile, "resolution_height", 0) > 0) - { - p = g_strdup_printf("%ix%i", - remmina_plugin_service->file_get_int(remminafile, "resolution_width", 0), - remmina_plugin_service->file_get_int(remminafile, "resolution_height", 0)); - remmina_plugin_service->file_set_string(remminafile, "resolution", p); - g_free(p); - } - remmina_plugin_service->file_set_string(remminafile, "name", remmina_plugin_service->file_get_string(remminafile, "server")); remmina_plugin_service->file_set_string(remminafile, "protocol", "RDP"); diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c index f30b5fdbb..9f20fe413 100644 --- a/remmina-plugins/rdp/rdp_plugin.c +++ b/remmina-plugins/rdp/rdp_plugin.c @@ -746,8 +746,8 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp) rfi->settings->ColorDepth = 32; } - rfi->settings->DesktopWidth = remmina_plugin_service->file_get_int(remminafile, "resolution_width", 1024); - rfi->settings->DesktopHeight = remmina_plugin_service->file_get_int(remminafile, "resolution_height", 768); + rfi->settings->DesktopWidth = remmina_plugin_service->get_profile_remote_width(gp); + rfi->settings->DesktopHeight = remmina_plugin_service->get_profile_remote_height(gp); dynresw = remmina_plugin_service->file_get_int(remminafile, "dynamic_resolution_width", 0); dynresh = remmina_plugin_service->file_get_int(remminafile, "dynamic_resolution_height", 0); @@ -1087,6 +1087,12 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget* gp) case FREERDP_ERROR_DNS_NAME_NOT_FOUND: remmina_plugin_service->protocol_plugin_set_error(gp, _("Unable to find the address of RDP server %s."), rfi->settings->ServerHostname ); break; + case FREERDP_ERROR_TLS_CONNECT_FAILED: + remmina_plugin_service->protocol_plugin_set_error(gp, _("Error connecting to RDP server %s. TLS connection failed. Check that client and server support a common TLS version."), rfi->settings->ServerHostname ); + break; + case FREERDP_ERROR_SECURITY_NEGO_CONNECT_FAILED: + remmina_plugin_service->protocol_plugin_set_error(gp, _("Unable to establish a connection to RDP server %s."), rfi->settings->ServerHostname ); + break; default: remmina_plugin_service->protocol_plugin_set_error(gp, _("Unable to connect to RDP server %s"), rfi->settings->ServerHostname); break; diff --git a/remmina-plugins/xdmcp/xdmcp_plugin.c b/remmina-plugins/xdmcp/xdmcp_plugin.c index c97d03d85..516497b48 100644 --- a/remmina-plugins/xdmcp/xdmcp_plugin.c +++ b/remmina-plugins/xdmcp/xdmcp_plugin.c @@ -119,8 +119,8 @@ static gboolean remmina_plugin_xdmcp_start_xephyr(RemminaProtocolWidget *gp) { argv[argc++] = g_strdup("-screen"); argv[argc++] = g_strdup_printf("%ix%ix%i", - remmina_plugin_service->file_get_int(remminafile, "resolution_width", 640), - remmina_plugin_service->file_get_int(remminafile, "resolution_height", 480), i); + remmina_plugin_service->get_profile_remote_width(gp), + remmina_plugin_service->get_profile_remote_height(gp), i); } if (i == 2) @@ -291,8 +291,8 @@ static gboolean remmina_plugin_xdmcp_open_connection(RemminaProtocolWidget *gp) remminafile = remmina_plugin_service->protocol_plugin_get_file(gp); - width = remmina_plugin_service->file_get_int(remminafile, "resolution_width", 640); - height = remmina_plugin_service->file_get_int(remminafile, "resolution_height", 480); + width = remmina_plugin_service->get_profile_remote_width(gp); + height = remmina_plugin_service->get_profile_remote_height(gp); remmina_plugin_service->protocol_plugin_set_width(gp, width); remmina_plugin_service->protocol_plugin_set_height(gp, height); gtk_widget_set_size_request(GTK_WIDGET(gp), width, height); |