diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-16 01:29:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-16 01:29:28 +0000 |
| commit | ee4cc41fafaac0a2d76c1c791f6d43a6b6d937a7 (patch) | |
| tree | 2fed674760fcb3031faac25e6bb5bd019cfad151 /avahi-daemon | |
| parent | 91c63aa9b11519356a319d28a134fa3693da02a9 (diff) | |
* start implementing error handling in avahi-client
* doxygen document timeval.h
* add two more AVAHI_GCC_SENTINELs
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@350 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
| -rw-r--r-- | avahi-daemon/dbus-protocol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index f72b8d6..772756b 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -354,7 +354,8 @@ static DBusHandlerResult respond_error(DBusConnection *c, DBusMessage *m, int er AVAHI_DBUS_ERR_DBUS_ERROR, AVAHI_DBUS_ERR_NOT_CONNECTED, AVAHI_DBUS_ERR_NO_MEMORY, - AVAHI_DBUS_ERR_INVALID_OBJECT + AVAHI_DBUS_ERR_INVALID_OBJECT, + AVAHI_DBUS_ERR_NO_DAEMON }; assert(-error > -AVAHI_OK); @@ -1686,9 +1687,8 @@ int dbus_protocol_setup(const AvahiPoll *poll_api) { goto fail; } - dbus_bus_add_match(server->bus, "type='signal',""interface='" DBUS_INTERFACE_DBUS "'", &error); - dbus_connection_add_filter(server->bus, msg_signal_filter_impl, (void*) poll_api, NULL); + dbus_bus_add_match(server->bus, "type='signal',""interface='" DBUS_INTERFACE_DBUS "'", &error); dbus_connection_register_object_path(server->bus, AVAHI_DBUS_PATH_SERVER, &server_vtable, NULL); return 0; |