From 9797ff818a594c09cc70da7613bb98f03948c5c8 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 2 May 2018 12:29:54 +0200
Subject: Re-thinking naming scheme. The server type provided on DBus must
 match the LightDM remote session name.

 So, this is not about a proto name here, but about how RDP sessions
 are implemented. The first approach by Canonical used
 .
   lightdm-remote-session-freerdp and libpam-freerdp.
 .
 We use
 .
   lightdm-remote-session-freerdp2 and libpam-freerdp2.
 .
 The greeter needs to be told exactly this: what implementation
 to use.
---
 src/org.ArcticaProject.RemoteLogon.xml | 4 ++--
 src/server.c                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org.ArcticaProject.RemoteLogon.xml b/src/org.ArcticaProject.RemoteLogon.xml
index 079a869..41016e8 100644
--- a/src/org.ArcticaProject.RemoteLogon.xml
+++ b/src/org.ArcticaProject.RemoteLogon.xml
@@ -2,7 +2,7 @@
 <node name="/">
 	<interface name="org.ArcticaProject.RemoteLogon">
 		<!-- SERVER LIST DOCS - it's in a few places :-)
-			s: server type: "ica", "rdp", "x2go", "uccs"
+			s: server type: "ica", "freerdp2", "x2go", "uccs"
 			s: server name
 			s: server uri
 			b: last used server
@@ -11,7 +11,7 @@
 				b: required
 				v: default value
 				a{sv}: properties for the value
-					for value 'domain': a list of possible domains (ica, rdp)
+					for value 'domain': a list of possible domains (ica, freerdp2)
 					"domains": a(s)
 					for value 'domain': a list of domains that are read only
 					"read-only": b
diff --git a/src/server.c b/src/server.c
index cae1517..dd18196 100644
--- a/src/server.c
+++ b/src/server.c
@@ -187,7 +187,7 @@ server_get_variant (Server * server)
 		if (IS_CITRIX_SERVER(server)) {
 			g_variant_builder_add_value(&tuple, g_variant_new_string("ica"));
 		} else if (IS_RDP_SERVER(server)) {
-			g_variant_builder_add_value(&tuple, g_variant_new_string("rdp"));
+			g_variant_builder_add_value(&tuple, g_variant_new_string("freerdp2"));
 		} else if (IS_UCCS_SERVER(server)) {
 			g_variant_builder_add_value(&tuple, g_variant_new_string("uccs"));
 		} else if (IS_X2GO_SERVER(server)) {
-- 
cgit v1.2.3