aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rwxr-xr-xfreerdp-session.in (renamed from x2go-session.in)2
-rw-r--r--freerdp.desktop.in (renamed from x2go.desktop.in)2
-rw-r--r--lightdm-remote-session-freerdp.in (renamed from lightdm-remote-session-x2go.in)0
-rw-r--r--lightdm-remote-x2go7
5 files changed, 5 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index ab1ae86..062d0f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,9 +45,9 @@ x2go_session_wrapper_CFLAGS = \
EXTRA_DIST = \
$(pam_session_DATA) \
- x2go.desktop.in \
- x2go-session.in \
- lightdm-remote-session-x2go.in
+ freerdp.desktop.in \
+ freerdp-session.in \
+ lightdm-remote-session-freerdp.in
CLEANFILES = \
x2go.desktop \
diff --git a/x2go-session.in b/freerdp-session.in
index ed59988..e95786f 100755
--- a/x2go-session.in
+++ b/freerdp-session.in
@@ -1,7 +1,7 @@
#!/bin/bash
if [ -e ~/.x2go-socket ]; then
- @pkglibexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin
+ @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin
else
zenity --warning --text="Unable to locate X2GoSession/PyHoca socket"
fi;
diff --git a/x2go.desktop.in b/freerdp.desktop.in
index f73154e..f976b14 100644
--- a/x2go.desktop.in
+++ b/freerdp.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=X2Go
+Name=FreeRDP
Comment=Full Screen X2Go Session
Exec=@libexecdir@/x2go-session-wrapper
TryExec=@libexecdir@/x2go-session-wrapper
diff --git a/lightdm-remote-session-x2go.in b/lightdm-remote-session-freerdp.in
index 9709a92..9709a92 100644
--- a/lightdm-remote-session-x2go.in
+++ b/lightdm-remote-session-freerdp.in
diff --git a/lightdm-remote-x2go b/lightdm-remote-x2go
deleted file mode 100644
index 86c3206..0000000
--- a/lightdm-remote-x2go
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so readenv=1
-auth required pam_env.so readenv=1 envfile=/etc/default/locale
-auth required pam_x2go.so
-session required pam_limits.so
-session required pam_x2go.so