diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-12-17 09:29:07 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-29 15:29:00 -0800 |
| commit | 33cec8af55d829cd77b297ae356ed7a00ce8523c (patch) | |
| tree | e93e6b79d127b884e85df831aae3eec12aa3593c | |
| parent | 480590b90c3966536451d2a2fecc42a66082ed77 (diff) | |
dbus-core: Attempt to connect to dbus ASAP
For systemd-logind integration we need the dbus connection to be available
before enumerating input and gfx devices.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | config/dbus-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/dbus-core.c b/config/dbus-core.c index 43d628194..b0fd92de4 100644 --- a/config/dbus-core.c +++ b/config/dbus-core.c @@ -233,8 +233,8 @@ dbus_core_init(void) memset(&bus_info, 0, sizeof(bus_info)); bus_info.fd = -1; bus_info.hooks = NULL; - bus_info.connection = NULL; - bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); + if (!connect_to_bus()) + bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); return 1; } |