aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/uccs-server.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c393ad5..4dadca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ remote-login-service-x2go (1.0.0.1-0x2go1) UNRELEASED; urgency=medium
- Apply patch 01_clear_servers.patch.
- Apply patch glib-deprecated.diff. Provide support for old
GLib versions.
+ - Apply 02_server-name.patch. Provide support for non-Canonical
+ UCCS servers.
* Add SERVER_NAME env var support.
* Add X2Go support to RLS.
* Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
diff --git a/src/uccs-server.c b/src/uccs-server.c
index 0ec6f04..d8c61a9 100644
--- a/src/uccs-server.c
+++ b/src/uccs-server.c
@@ -20,6 +20,7 @@
#include "config.h"
#endif
+#include <glib.h>
#include <glib/gi18n.h>
#include <json-glib/json-glib.h>
@@ -734,6 +735,8 @@ uccs_server_unlock (UccsServer * server, const gchar * address, const gchar * us
argv[1] = server->username;
argv[2] = NULL;
+ g_setenv("SERVER_ROOT", server->parent.uri, TRUE);
+
g_spawn_async_with_pipes(NULL, /* pwd */
(gchar **)argv,
NULL, /* env */