aboutsummaryrefslogtreecommitdiffstats
path: root/brillo/daemons/dbus_daemon.cc
diff options
context:
space:
mode:
Diffstat (limited to 'brillo/daemons/dbus_daemon.cc')
-rw-r--r--brillo/daemons/dbus_daemon.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/brillo/daemons/dbus_daemon.cc b/brillo/daemons/dbus_daemon.cc
index 6e90686..a48b288 100644
--- a/brillo/daemons/dbus_daemon.cc
+++ b/brillo/daemons/dbus_daemon.cc
@@ -18,21 +18,13 @@ namespace brillo {
DBusDaemon::DBusDaemon() {
}
-DBusDaemon::~DBusDaemon() {
- if (bus_)
- bus_->ShutdownAndBlock();
-}
-
int DBusDaemon::OnInit() {
int exit_code = Daemon::OnInit();
if (exit_code != EX_OK)
return exit_code;
- dbus::Bus::Options options;
- options.bus_type = dbus::Bus::SYSTEM;
-
- bus_ = new dbus::Bus(options);
- CHECK(bus_->Connect());
+ bus_ = dbus_connection_.Connect();
+ CHECK(bus_);
return exit_code;
}