summaryrefslogtreecommitdiffstats
path: root/avahi-daemon/dbus-service-browser.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-07-15 20:15:30 +0000
committerLennart Poettering <lennart@poettering.net>2006-07-15 20:15:30 +0000
commitc4ee97bf1fe6ca9caf4f17a2a5a77a620ff7d9d7 (patch)
treef4c6504b9e2e825df0ba37c8e080366126a3b89b /avahi-daemon/dbus-service-browser.c
parent9d58b3d0814aeea8509ecaba28266fef80725c70 (diff)
work around a limitation in Gentoo's DBUS build (which is compiled with --disable-checks): never try to unregister non-existing object paths from DBUS. (closes #50 - this time for sure)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1235 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/dbus-service-browser.c')
-rw-r--r--avahi-daemon/dbus-service-browser.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/avahi-daemon/dbus-service-browser.c b/avahi-daemon/dbus-service-browser.c
index 975cce9..29d79b6 100644
--- a/avahi-daemon/dbus-service-browser.c
+++ b/avahi-daemon/dbus-service-browser.c
@@ -38,8 +38,12 @@ void avahi_dbus_service_browser_free(ServiceBrowserInfo *i) {
if (i->service_browser)
avahi_s_service_browser_free(i->service_browser);
- dbus_connection_unregister_object_path(server->bus, i->path);
- avahi_free(i->path);
+
+ if (i->path) {
+ dbus_connection_unregister_object_path(server->bus, i->path);
+ avahi_free(i->path);
+ }
+
AVAHI_LLIST_REMOVE(ServiceBrowserInfo, service_browsers, i->client->service_browsers, i);
i->client->n_objects--;