2008-06-24 Dimitris Glezos <dimitris@glezos.com> (via glezos@fedoraproject.org)

[catta] / avahi-daemon / dbus-async-host-name-resolver.c

diff --git a/avahi-daemon/dbus-async-host-name-resolver.c b/avahi-daemon/dbus-async-host-name-resolver.c
index 0082c4f136ea4c41748f2b640101fcadd6b41ab8..a2c99a7f9d845d25734801382bdcfa6a17d40506 100644 (file)
--- a/avahi-daemon/dbus-async-host-name-resolver.c
+++ b/avahi-daemon/dbus-async-host-name-resolver.c
@@ -38,7 +38,11 @@ void avahi_dbus_async_host_name_resolver_free(AsyncHostNameResolverInfo *i) {
 
     if (i->host_name_resolver)
         avahi_s_host_name_resolver_free(i->host_name_resolver);
-    dbus_connection_unregister_object_path(server->bus, i->path);
+
+    if (i->path) {
+        dbus_connection_unregister_object_path(server->bus, i->path);
+        avahi_free(i->path);
+    }
     AVAHI_LLIST_REMOVE(AsyncHostNameResolverInfo, async_host_name_resolvers, i->client->async_host_name_resolvers, i);
 
     i->client->n_objects--;
@@ -106,7 +110,7 @@ DBusHandlerResult avahi_dbus_msg_async_host_name_resolver_impl(DBusConnection *c
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "HostNameResolver.Introspect");
+        return avahi_dbus_handle_introspect(c, m, "HostNameResolver.introspect");
     
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))