diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-10-04 08:54:58 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-10-04 08:54:58 +0100 |
| commit | 9fafead23d5a8f66ea65c36b450017b10cf8b5fb (patch) | |
| tree | 5fb4993e3b45eeb31a868e3eb3d6d9892f5766ae /bus | |
| parent | c7495461fe6b48b4070452ed8640fbc4888f1210 (diff) | |
| parent | 62aec8838a2d3841c5f1377c6eef429a7df84aed (diff) | |
| download | dbus-9fafead23d5a8f66ea65c36b450017b10cf8b5fb.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
bus/activation-helper.c
configure.ac
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/activation-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c index cbc00d2f..8d7ae36f 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -154,11 +154,11 @@ clear_environment (DBusError *error) "could not clear environment\n"); return FALSE; } -#endif /* Ensure the bus is set to system */ _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS); _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system"); +#endif return TRUE; } |