aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-02 12:29:54 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-02 12:29:56 +0200
commit9797ff818a594c09cc70da7613bb98f03948c5c8 (patch)
tree20a109bf8c0cbd9268335aab094da279f6210e51
parent61e0e54e19279c41244457544e1b6f8a3c4409b8 (diff)
downloadremote-logon-service-9797ff818a594c09cc70da7613bb98f03948c5c8.tar.gz
remote-logon-service-9797ff818a594c09cc70da7613bb98f03948c5c8.tar.bz2
remote-logon-service-9797ff818a594c09cc70da7613bb98f03948c5c8.zip
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.
-rw-r--r--src/org.ArcticaProject.RemoteLogon.xml4
-rw-r--r--src/server.c2
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)) {