Remove a couple of legacy resolution fields

2 files changed, 11 insertions, 24 deletions

diff --git a/remmina-plugins/nx/nx_plugin.c b/remmina-plugins/nx/nx_plugin.c
index e48d2dbff..86b9949e2 100644
--- a/remmina-plugins/nx/nx_plugin.c
+++ b/remmina-plugins/nx/nx_plugin.c
@@ -592,17 +592,13 @@ static gboolean remmina_plugin_nx_open_connection(RemminaProtocolWidget *gp)
 
 	remminafile = remmina_plugin_nx_service->protocol_plugin_get_file(gp);
 
-	resolution = remmina_plugin_nx_service->file_get_string(remminafile, "resolution");
-	if (!resolution || !strchr(resolution, 'x')) {
-		remmina_plugin_nx_service->protocol_plugin_set_expand(gp, TRUE);
-		gtk_widget_set_size_request(GTK_WIDGET(gp), 640, 480);
-	}else  {
-		width = remmina_plugin_nx_service->file_get_int(remminafile, "resolution_width", 640);
-		height = remmina_plugin_nx_service->file_get_int(remminafile, "resolution_height", 480);
-		remmina_plugin_nx_service->protocol_plugin_set_width(gp, width);
-		remmina_plugin_nx_service->protocol_plugin_set_height(gp, height);
-		gtk_widget_set_size_request(GTK_WIDGET(gp), width, height);
-	}
+	width = remmina_plugin_nx_service->get_profile_remote_width(gp);
+	height = remmina_plugin_nx_service->get_profile_remote_height(gp);
+
+	remmina_plugin_nx_service->protocol_plugin_set_width(gp, width);
+	remmina_plugin_nx_service->protocol_plugin_set_height(gp, height);
+	gtk_widget_set_size_request(GTK_WIDGET(gp), width, height);
+
 	gpdata->socket_id = gtk_socket_get_id(GTK_SOCKET(gpdata->socket));
 
 	if (pthread_create(&gpdata->thread, NULL, remmina_plugin_nx_main_thread, gp)) {
diff --git a/remmina-plugins/rdp/rdp_file.c b/remmina-plugins/rdp/rdp_file.c
index 0f68ba583..e2f1b2aa2 100644
--- a/remmina-plugins/rdp/rdp_file.c
+++ b/remmina-plugins/rdp/rdp_file.c
@@ -216,22 +216,13 @@ gboolean remmina_rdp_file_export_test(RemminaFile* remminafile)
 gboolean remmina_rdp_file_export_channel(RemminaFile* remminafile, FILE* fp)
 {
 	TRACE_CALL(__func__);
-	gchar* s;
-	gchar* p;
 	const gchar* cs;
 
 	fprintf(fp, "screen mode id:i:2\r\n");
-	cs = remmina_plugin_service->file_get_string(remminafile, "resolution");
-	if (cs) {
-		s = g_strdup(cs);
-		p = strchr(s, 'x');
-		if (p) {
-			*p++ = '\0';
-			fprintf(fp, "desktopwidth:i:%s\r\n", s);
-			fprintf(fp, "desktopheight:i:%s\r\n", p);
-		}
-		g_free(s);
-	}
+	cs = remmina_plugin_service->file_get_string(remminafile, "resolution_width");
+	fprintf(fp, "desktopwidth:i:%s\r\n", cs);
+	cs = remmina_plugin_service->file_get_string(remminafile, "resolution_height");
+	fprintf(fp, "desktopheight:i:%s\r\n", cs);
 
 	fprintf(fp, "session bpp:i:%i\r\n", remmina_plugin_service->file_get_int(remminafile, "colordepth", 8));
 	//fprintf(fp, "winposstr:s:0,1,123,34,931,661\r\n");