diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-20 22:14:48 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-24 11:25:50 +0000 |
| commit | 160f5bb9d262ebb0c3ae53487996c1f76c3ad352 (patch) | |
| tree | b108ea2ae8298a4b5e0f02dd0eca08f12da56f11 /tools/tool-common.h | |
| parent | 71c11a9e487ec5c4b533371098201efb5d966961 (diff) | |
| download | dbus-160f5bb9d262ebb0c3ae53487996c1f76c3ad352.tar.gz | |
dbus-launch: if autolaunching, use XDG_RUNTIME_DIR/bus if available
This provides backwards-compatible autolaunching behaviour, as long
as dbus-launch inherits the XDG_RUNTIME_DIR (which it presumably did
if it's going to work at all, since it must also have inherited the
DISPLAY). In particular, we go through the motions of starting the
dbus-daemon, so that we can start the "babysitter" process that will
maintain the X11 window to store the bus address.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61301
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
[smcv: decorate _dbus_lookup_user_bus with DBUS_PRIVATE_EXPORT so we
can still call it after fixing fd.o#83115; update cmake to match Autotools]
Diffstat (limited to 'tools/tool-common.h')
| -rw-r--r-- | tools/tool-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tool-common.h b/tools/tool-common.h index d56abf8a..c5984821 100644 --- a/tools/tool-common.h +++ b/tools/tool-common.h @@ -33,7 +33,7 @@ #endif void tool_millisleep (int ms); -void tool_oom (const char *doing); +void tool_oom (const char *doing) _DBUS_GNUC_NORETURN; dbus_bool_t tool_write_all (int fd, const void *buf, size_t size); #endif |