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/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/server.c')
| -rw-r--r-- | src/server.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server.c b/src/server.c index 2f36898..551aa99 100644 --- a/src/server.c +++ b/src/server.c @@ -25,6 +25,7 @@ #include "citrix-server.h" #include "rdp-server.h" #include "uccs-server.h" +#include "x2go-server.h" static void server_class_init (ServerClass *klass); static void server_init (Server *self); @@ -162,6 +163,9 @@ server_new_from_json (JsonObject * object) else if (g_strcmp0(proto, "freerdp") == 0 || g_strcmp0(proto, "rdp") == 0 || g_strcmp0(proto, "RDP") == 0 || g_strcmp0(proto, "FreeRDP") == 0) { newserver = rdp_server_new_from_json(object); } + else if (g_strcmp0(proto, "x2go") == 0 || g_strcmp0(proto, "X2go") == 0 || g_strcmp0(proto, "X2Go") == 0 || g_strcmp0(proto, "X2GO") == 0 || g_strcmp0(proto, "x2GO") == 0 || g_strcmp0(proto, "x2gO") == 0) { + newserver = x2go_server_new_from_json(object); + } return newserver; } @@ -184,6 +188,8 @@ server_get_variant (Server * server) g_variant_builder_add_value(&tuple, g_variant_new_string("freerdp")); } else if (IS_UCCS_SERVER(server)) { g_variant_builder_add_value(&tuple, g_variant_new_string("uccs")); + } else if (IS_X2GO_SERVER(server)) { + g_variant_builder_add_value(&tuple, g_variant_new_string("x2go")); } else { g_assert_not_reached(); } |