summaryrefslogtreecommitdiffstats
path: root/dbus/bus.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 16:43:26 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 16:43:26 +0000
commitb4a70c353fe2ea1119eb9d1165d92d473a55fc04 (patch)
treef57febdf29701528cde591e9416c9182e1f3c90c /dbus/bus.cc
parent13b50e6ea63c955afefc636732e9156ff3efbfae (diff)
downloadchromium_src-b4a70c353fe2ea1119eb9d1165d92d473a55fc04.zip
chromium_src-b4a70c353fe2ea1119eb9d1165d92d473a55fc04.tar.gz
chromium_src-b4a70c353fe2ea1119eb9d1165d92d473a55fc04.tar.bz2
dbus: Reuse is_set() function from ScopedDBusError API.
R=satorux@chromium.org TEST=dbus_unittests Review URL: https://codereview.chromium.org/11266020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/bus.cc')
-rw-r--r--dbus/bus.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/bus.cc b/dbus/bus.cc
index 73122c2..988a7c1f 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -305,7 +305,7 @@ bool Bus::Connect() {
}
if (!connection_) {
LOG(ERROR) << "Failed to connect to the bus: "
- << (dbus_error_is_set(error.get()) ? error.message() : "");
+ << (error.is_set() ? error.message() : "");
return false;
}
// We shouldn't exit on the disconnected signal.
@@ -429,7 +429,7 @@ bool Bus::RequestOwnershipAndBlock(const std::string& service_name) {
error.get());
if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
LOG(ERROR) << "Failed to get the ownership of " << service_name << ": "
- << (dbus_error_is_set(error.get()) ? error.message() : "");
+ << (error.is_set() ? error.message() : "");
return false;
}
owned_service_names_.insert(service_name);