diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-02 20:45:23 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-02 20:45:23 +0100 |
| commit | d8d094ddbe0fb9ab86ecd33f6cdd056d8b1ce9f2 (patch) | |
| tree | a5c9a598350664e0734fd145e7a0db5d35875caf /src/uccs-server.c | |
| parent | b9ad4d789d0ed95cda227e753a7927ad9a4340cc (diff) | |
| download | remote-logon-service-d8d094ddbe0fb9ab86ecd33f6cdd056d8b1ce9f2.tar.gz remote-logon-service-d8d094ddbe0fb9ab86ecd33f6cdd056d8b1ce9f2.tar.bz2 remote-logon-service-d8d094ddbe0fb9ab86ecd33f6cdd056d8b1ce9f2.zip | |
upload to ppa:x2go/stable+ppa (ubuntu/1.0.0-0ubuntu3+x2go1~0ubuntu14.04.1)
* Non-maintainer upload.
* Add SERVER_NAME env var support.
* Add X2Go support to RLS.
* Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad.
Diffstat (limited to 'src/uccs-server.c')
| -rw-r--r-- | src/uccs-server.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/uccs-server.c b/src/uccs-server.c index c17cf38..52fc301 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> @@ -466,6 +467,10 @@ uccs_server_new_from_keyfile (GKeyFile * keyfile, const gchar * groupname) static gboolean parse_rds_array (UccsServer * server, JsonArray * array) { + // Got a new set of servers, delete the old one + g_list_free_full(server->subservers, g_object_unref); + server->subservers = NULL; + int i; for (i = 0; i < json_array_get_length(array); i++) { JsonNode * node = json_array_get_element(array, i); @@ -730,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 */ |