summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@openedhand.com>2007-11-06 16:25:40 +0100
committerDodji Seketeli <dodji@openedhand.com>2007-11-06 16:26:25 +0100
commitaaa50b64113b122aaebd46e3b78e3fb7a8d70500 (patch)
tree72bbc7c789079e8e74ba4b9f8fa64cd66bc00cd9
parent868e303630d8b84070c2f1fd8d6da2cef045b029 (diff)
parentddce48ede036f3996f8e584b0012c396c5df42fb (diff)
resync with 'master'
-rw-r--r--config/dbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/dbus.c b/config/dbus.c
index c8675120f..6fe061815 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -355,8 +355,8 @@ connect_hook(DBusConnection *connection, void *data)
dbus_error_init(&error);
- if (!dbus_bus_request_name(info->connection, info->busname,
- 0, &error)) {
+ dbus_bus_request_name(info->connection, info->busname, 0, &error);
+ if (dbus_error_is_set(&error)) {
ErrorF("[config/dbus] couldn't take over org.x.config: %s (%s)\n",
error.name, error.message);
goto err_start;