From e9cb382daf7cef6396d1777c99f27a050f7ad4a8 Mon Sep 17 00:00:00 2001 From: James Willcox Date: Wed, 14 May 2003 02:40:41 +0000 Subject: 2003-05-13 James Willcox * configure.in: * bus/activation.c: (bus_activation_service_created), (bus_activation_activate_service): * bus/driver.c: (bus_driver_send_service_deleted), (bus_driver_send_service_created), (bus_driver_send_service_lost), (bus_driver_send_service_acquired), (bus_driver_send_welcome_message), (bus_driver_handle_list_services): * bus/session.conf.in: * dbus/dbus-bus.c: (dbus_bus_acquire_service), (dbus_bus_service_exists), (dbus_bus_activate_service): * dbus/dbus-bus.h: Add some convenience API which lets you activate a service, and did a bunch of s/0/DBUS_TYPE_INVALID/ in calls to dbus_message_append_args() and dbus_message_get_args() --- bus/driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'bus/driver.c') diff --git a/bus/driver.c b/bus/driver.c index 3c4847ba..e0afd8ef 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -60,7 +60,7 @@ bus_driver_send_service_deleted (const char *service_name, if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS) || !dbus_message_append_args (message, DBUS_TYPE_STRING, service_name, - 0)) + DBUS_TYPE_INVALID)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -100,7 +100,7 @@ bus_driver_send_service_created (const char *service_name, if (!dbus_message_append_args (message, DBUS_TYPE_STRING, service_name, - 0)) + DBUS_TYPE_INVALID)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -133,7 +133,7 @@ bus_driver_send_service_lost (DBusConnection *connection, if (!dbus_message_append_args (message, DBUS_TYPE_STRING, service_name, - 0)) + DBUS_TYPE_INVALID)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -174,7 +174,7 @@ bus_driver_send_service_acquired (DBusConnection *connection, if (!dbus_message_append_args (message, DBUS_TYPE_STRING, service_name, - 0)) + DBUS_TYPE_INVALID)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -352,7 +352,7 @@ bus_driver_send_welcome_message (DBusConnection *connection, if (!dbus_message_append_args (welcome, DBUS_TYPE_STRING, name, - NULL)) + DBUS_TYPE_INVALID)) { dbus_message_unref (welcome); BUS_SET_OOM (error); @@ -403,7 +403,7 @@ bus_driver_handle_list_services (DBusConnection *connection, if (!dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, services, len, - 0)) + DBUS_TYPE_INVALID)) { dbus_free_string_array (services); dbus_message_unref (reply); @@ -447,7 +447,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection, if (!dbus_message_get_args (message, error, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &flags, - 0)) + DBUS_TYPE_INVALID)) return FALSE; _dbus_verbose ("Trying to own service %s with flags 0x%x\n", name, flags); @@ -510,7 +510,7 @@ bus_driver_handle_service_exists (DBusConnection *connection, if (!dbus_message_get_args (message, error, DBUS_TYPE_STRING, &name, - 0)) + DBUS_TYPE_INVALID)) return FALSE; retval = FALSE; @@ -567,7 +567,7 @@ bus_driver_handle_activate_service (DBusConnection *connection, if (!dbus_message_get_args (message, error, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &flags, - 0)) + DBUS_TYPE_INVALID)) { _DBUS_ASSERT_ERROR_IS_SET (error); _dbus_verbose ("No memory to get arguments to ActivateService\n"); -- cgit