summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-02-02 01:32:43 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-02-02 01:32:43 +0000
commit6d5d65dba6471a5fc16a0529855c3746f15bf5c6 (patch)
tree0e32d7f1b5172b012a8dee055ce449476875bb4e
parent633cd9ccef0ad31cfcb7cd9cd48a3369d27ff18a (diff)
2003-02-02 Anders Carlsson <set EMAIL_ADDRESS environment variable>
* bus/driver.c: (bus_driver_handle_service_exists): Simplify the code a bit. * dbus/dbus-bus.c: (dbus_bus_service_exists): Fix a silly.
-rw-r--r--ChangeLog8
-rw-r--r--bus/driver.c2
-rw-r--r--dbus/dbus-bus.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 05701f0a..10769ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-02 Anders Carlsson <set EMAIL_ADDRESS environment variable>
+
+ * bus/driver.c: (bus_driver_handle_service_exists):
+ Simplify the code a bit.
+
+ * dbus/dbus-bus.c: (dbus_bus_service_exists):
+ Fix a silly.
+
2003-02-02 Anders Carlsson <andersca@codefactory.se>
* bus/Makefile.am:
diff --git a/bus/driver.c b/bus/driver.c
index a99d6516..71b780bb 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -359,7 +359,7 @@ bus_driver_handle_service_exists (DBusConnection *connection,
_DBUS_HANDLE_OOM (dbus_message_set_sender (reply, DBUS_SERVICE_DBUS));
_DBUS_HANDLE_OOM (dbus_message_append_fields (reply,
- DBUS_TYPE_UINT32, (service != NULL ? 1 : 0),
+ DBUS_TYPE_UINT32, service != NULL,
0));
_DBUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL));
dbus_message_unref (reply);
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 6372c873..a9468ed6 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -186,7 +186,8 @@ dbus_bus_service_exists (DBusConnection *connection,
}
dbus_set_result (result, DBUS_RESULT_SUCCESS);
- return (result != FALSE);
+
+ return (exists != FALSE);
}
/** @} */