Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

This commit is contained in:
Tristan Matthews
2012-02-02 10:42:07 -05:00

View File

@ -80,11 +80,27 @@ DBusManager::~DBusManager()
void DBusManager::exec()
{
dispatcher_.enter();
try {
dispatcher_.enter();
} catch (const DBus::Error &err) {
ERROR("%s: %s, exiting\n", err.name(), err.what());
::exit(EXIT_FAILURE);
} catch (const std::exception &err) {
ERROR("%s: %s, exiting\n", err.what());
::exit(EXIT_FAILURE);
}
}
void
DBusManager::exit()
{
dispatcher_.leave();
try {
dispatcher_.leave();
} catch (const DBus::Error &err) {
ERROR("%s: %s, exiting\n", err.name(), err.what());
::exit(EXIT_FAILURE);
} catch (const std::exception &err) {
ERROR("%s: %s, exiting\n", err.what());
::exit(EXIT_FAILURE);
}
}