From c0c4437a4187e3dc9d406276aa68a8639a5a8c09 Mon Sep 17 00:00:00 2001 From: Giovanni Panozzo Date: Tue, 24 Oct 2017 12:14:20 +0200 Subject: Another fix for #1323 --- remmina-plugins/nx/nx_plugin.c | 4 ++-- remmina-plugins/rdp/rdp_file.c | 10 ---------- remmina-plugins/rdp/rdp_plugin.c | 4 ++-- remmina-plugins/xdmcp/xdmcp_plugin.c | 8 ++++---- 4 files changed, 8 insertions(+), 18 deletions(-) (limited to 'remmina-plugins') diff --git a/remmina-plugins/nx/nx_plugin.c b/remmina-plugins/nx/nx_plugin.c index f1ed4a31d..88ba80643 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 7d02254b4..eb15a7d58 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 ae93e3b11..17ebf0e7b 100644 --- a/remmina-plugins/rdp/rdp_plugin.c +++ b/remmina-plugins/rdp/rdp_plugin.c @@ -752,8 +752,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); diff --git a/remmina-plugins/xdmcp/xdmcp_plugin.c b/remmina-plugins/xdmcp/xdmcp_plugin.c index b45d7674e..2989b46ad 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); -- cgit v1.2.3