fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-01 06:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* bus/driver.c (bus_driver_handle_reload_config): Make sure we send an

Browse source 
empty reply so blocking calls don't block forever (Patch from Sjoerd
  Simons <sjoerd at luon.net>)

* AUTHORS: Add Robert McQueen for his work on the Python
  Bindings and other parts of D-Bus
This commit is contained in:
John (J5) Palmieri 2005-11-07 21:57:13 +00:00
parent e598c5edc5
commit 45ef0fbc4f
3 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -3,6 +3,7 @@ Philip Blundell <pb@nexus.co.uk>
Anders Carlsson <andersca@gnome.org>
Kristian Hogsberg <krh@redhat.com>
Alex Larsson <alexl@redhat.com>
Robert McQueen <robot101@debian.org>
Michael Meeks <michael@ximian.com>
Seth Nickell <seth@gnome.org>
John (J5) Palmieri <johnp@redhat.com>

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-11-07 John (J5) Palmieri <johnp@redhat.com>
* bus/driver.c (bus_driver_handle_reload_config): Make sure we send an
empty reply so blocking calls don't block forever (Patch from Sjoerd
Simons <sjoerd at luon.net>)
* AUTHORS: Add Robert McQueen for his work on the Python
Bindings and other parts of D-Bus
2005-11-07 Robert McQueen <robot101@debian.org>
* python/decorators.py: Change emit_signal function to use the

33
bus/driver.c
View file

@ -1094,23 +1094,34 @@ bus_driver_handle_reload_config (DBusConnection *connection,
DBusError *error)
{
BusContext *context;
dbus_bool_t retval;
DBusMessage *reply;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
retval = FALSE;
reply = NULL;
context = bus_connection_get_context (connection);
if (!bus_context_reload_config (context, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
goto out;
}
goto failed;
retval = TRUE;
out:
return retval;
reply = dbus_message_new_method_return (message);
if (reply == NULL)
goto oom;
if (! bus_transaction_send_from_driver (transaction, connection, reply))
goto oom;
dbus_message_unref (reply);
return TRUE;
oom:
BUS_SET_OOM (error);
failed:
_DBUS_ASSERT_ERROR_IS_SET (error);
if (reply)
dbus_message_unref (reply);
return FALSE;
}
/* For speed it might be useful to sort this in order of