diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-02-28 10:50:58 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-02-28 10:50:58 +1100 |
| commit | fd95b0639b90ba103ae7c2fa4be1266f715da325 (patch) | |
| tree | f14501b4998fac418f0fdff1cd350e028ee79936 /tests | |
| parent | fe857c2b081c78d3e58009777b68a84c1048f9bc (diff) | |
| download | lightdm-fd95b0639b90ba103ae7c2fa4be1266f715da325.tar.gz | |
Tidy up getting bus addresses
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/dbus-env.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/src/dbus-env.c b/tests/src/dbus-env.c index aa1a70f4..3fe9a73a 100644 --- a/tests/src/dbus-env.c +++ b/tests/src/dbus-env.c @@ -41,6 +41,9 @@ create_bus (const gchar *config_file, GPid *pid) } address[n_read] = '\0'; + if (n_read > 0 && address[n_read - 1] == '\n') + address[n_read - 1] = '\0'; + return g_strdup (address); } @@ -54,12 +57,12 @@ main (int argc, char **argv) conf_file = g_build_filename (DATADIR, "system.conf", NULL); system_bus_address = create_bus (conf_file, &system_bus_pid); g_free (conf_file); - g_setenv ("DBUS_SYSTEM_BUS_ADDRESS", g_strstrip (system_bus_address), TRUE); + g_setenv ("DBUS_SYSTEM_BUS_ADDRESS", system_bus_address, TRUE); conf_file = g_build_filename (DATADIR, "session.conf", NULL); session_bus_address = create_bus (conf_file, &session_bus_pid); g_free (conf_file); - g_setenv ("DBUS_SESSION_BUS_ADDRESS", g_strstrip (session_bus_address), TRUE); + g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_address, TRUE); child_pid = fork (); if (child_pid == 0) |