diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:41:08 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:43:59 +0100 |
| commit | 1261f34c8ec98769224c18fd9d18516d5180018f (patch) | |
| tree | 9445b0348a42a8cfaf5a4845648374364bef912d | |
| parent | be5a91027e0f99202005e95e5dbcff387af618d2 (diff) | |
| download | remote-logon-service-1261f34c8ec98769224c18fd9d18516d5180018f.tar.gz remote-logon-service-1261f34c8ec98769224c18fd9d18516d5180018f.tar.bz2 remote-logon-service-1261f34c8ec98769224c18fd9d18516d5180018f.zip | |
Apply patch 01_clear_servers.patch.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | src/uccs-server.c | 4 | ||||
| -rw-r--r-- | tests/dbus-interface.c | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 74db046..5762757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -remote-login-service-x2go (1.0.0-0x2go1) UNRELEASED; urgency=medium +remote-login-service-x2go (1.0.0.1-0x2go1) UNRELEASED; urgency=medium + * First forked/upstream release (1.0.0.1): + - Apply patch 01_clear_servers.patch. * 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 c17cf38..0ec6f04 100644 --- a/src/uccs-server.c +++ b/src/uccs-server.c @@ -466,6 +466,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); diff --git a/tests/dbus-interface.c b/tests/dbus-interface.c index 28ce314..e699ea5 100644 --- a/tests/dbus-interface.c +++ b/tests/dbus-interface.c @@ -184,9 +184,12 @@ slmock_check_login(GDBusConnection * session, slmock_table_t * slmockdata, gbool GVariant * array = g_variant_get_child_value(retval, 2); int i; + // Check all servers should be in the result are in the result for (i = 0; slmockdata->servers[i].name != NULL; i++) { g_assert(find_server(array, &slmockdata->servers[i])); } + // Check there is no more servers in the result than we expected + g_assert(i == g_variant_n_children(array)); g_variant_unref(array); g_variant_unref(retval); |