diff options
| author | James Willcox <jwillcox@gnome.org> | 2003-05-14 02:40:41 +0000 |
|---|---|---|
| committer | James Willcox <jwillcox@gnome.org> | 2003-05-14 02:40:41 +0000 |
| commit | e9cb382daf7cef6396d1777c99f27a050f7ad4a8 (patch) | |
| tree | e3cdadde817c2c2d285462ad9d1354a3bc54ec49 /bus | |
| parent | d4e80132af03363a2f861cfd611847ee8758aed9 (diff) | |
2003-05-13 James Willcox <jwillcox@gnome.org>
* 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()
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/activation.c | 4 | ||||
| -rw-r--r-- | bus/driver.c | 18 | ||||
| -rw-r--r-- | bus/session.conf.in | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/bus/activation.c b/bus/activation.c index 3682eecc..a52fa4bc 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -595,7 +595,7 @@ bus_activation_service_created (BusActivation *activation, if (!dbus_message_append_args (message, DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ACTIVATED, - 0)) + DBUS_TYPE_INVALID)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -877,7 +877,7 @@ bus_activation_activate_service (BusActivation *activation, if (!dbus_message_append_args (message, DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE, - 0)) + DBUS_TYPE_INVALID)) { _dbus_verbose ("No memory to set args of reply to activate message\n"); BUS_SET_OOM (error); 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"); diff --git a/bus/session.conf.in b/bus/session.conf.in index 4feca235..673d8739 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -10,6 +10,8 @@ <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> + <servicedir>@EXPANDED_LIBDIR@/dbus-1.0/services</servicedir> + <policy context="default"> <!-- Allow everything --> <allow send="*"/> |