|
|
@ -449,7 +449,7 @@ void dbus_manager::init()
|
|
|
|
if (m_inited)
|
|
|
|
if (m_inited)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if (!m_dbus_ldr.Load("libdbus-1.so.3"))
|
|
|
|
if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3"))
|
|
|
|
throw std::runtime_error("Could not load libdbus-1.so.3");
|
|
|
|
throw std::runtime_error("Could not load libdbus-1.so.3");
|
|
|
|
|
|
|
|
|
|
|
|
m_dbus_ldr.error_init(&m_error);
|
|
|
|
m_dbus_ldr.error_init(&m_error);
|
|
|
@ -465,9 +465,11 @@ void dbus_manager::init()
|
|
|
|
m_inited = true;
|
|
|
|
m_inited = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
dbus_manager::~dbus_manager()
|
|
|
|
void dbus_manager::deinit()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (m_inited) {
|
|
|
|
if (!m_inited)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
// unreference system bus connection instead of closing it
|
|
|
|
// unreference system bus connection instead of closing it
|
|
|
|
if (m_dbus_conn) {
|
|
|
|
if (m_dbus_conn) {
|
|
|
|
disconnect_from_signals();
|
|
|
|
disconnect_from_signals();
|
|
|
@ -475,7 +477,12 @@ dbus_manager::~dbus_manager()
|
|
|
|
m_dbus_conn = nullptr;
|
|
|
|
m_dbus_conn = nullptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
m_dbus_ldr.error_free(&m_error);
|
|
|
|
m_dbus_ldr.error_free(&m_error);
|
|
|
|
}
|
|
|
|
m_inited = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dbus_manager::~dbus_manager()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
deinit();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void dbus_manager::connect_to_signals()
|
|
|
|
void dbus_manager::connect_to_signals()
|
|
|
|