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.

diff --git a/ChangeLog b/ChangeLog
index 05701f0..10769ae 100644 (file)
--- 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 a99d651..71b780b 100644 (file)
--- 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 6372c87..a9468ed 100644 (file)
--- 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);
 }
 
 /** @} */