From 02dfd4fb3427a6afef6b9b99d39de6248a20e0cb Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 13 Feb 2003 19:06:42 +0000 Subject: 2003-02-13 Anders Carlsson * bus/Makefile.am: Add utils.[ch] * bus/connection.c: (bus_connection_foreach): Fix a warning. * bus/desktop-file.c: (grow_lines_in_section), (grow_sections), (unescape_string), (new_section), (parse_section_start), (parse_key_value), (report_error), (bus_desktop_file_load), (bus_desktop_file_get_string): * bus/desktop-file.h: Use DBusError for error reporting. * bus/dispatch.c: (send_one_message), (bus_dispatch_message_handler): * 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_handle_hello), (bus_driver_send_welcome_message), (bus_driver_handle_list_services), (bus_driver_handle_acquire_service), (bus_driver_handle_service_exists): * bus/loop.c: (bus_loop_run): * bus/main.c: Use BUS_HANDLE_OOM instead of _DBUS_HANDLE_OOM. * bus/utils.c: (bus_wait_for_memory): * bus/utils.h: New files with general utility functions. * dbus/dbus-internals.h: Remove _DBUS_HANDLE_OOM. --- bus/dispatch.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bus/dispatch.c') diff --git a/bus/dispatch.c b/bus/dispatch.c index a02916be..5b069593 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -24,6 +24,7 @@ #include "dispatch.h" #include "connection.h" #include "driver.h" +#include "utils.h" #include #include @@ -32,7 +33,7 @@ static int message_handler_slot; static void send_one_message (DBusConnection *connection, void *data) { - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, data, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, data, NULL, NULL)); } void @@ -54,7 +55,7 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, /* Assign a sender to the message */ sender = bus_connection_get_name (connection); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, sender)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, sender)); service_name = dbus_message_get_service (message); @@ -83,8 +84,8 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, _dbus_assert (bus_service_get_primary_owner (service) != NULL); /* Dispatch the message */ - _DBUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service), - message, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service), + message, NULL, NULL)); } return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS; -- cgit