Fix error message when passing invalid command line arguments. I admit defeat, tedp...

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

diff --git a/avahi-daemon/dbus-async-service-resolver.c b/avahi-daemon/dbus-async-service-resolver.c
index 2f16e506bb2631838830be90c5ca0517977e7d5b..a9a13644977e8a754d509e7364305d737c96333f 100644 (file)
--- a/avahi-daemon/dbus-async-service-resolver.c
+++ b/avahi-daemon/dbus-async-service-resolver.c
@@ -39,7 +39,11 @@ void avahi_dbus_async_service_resolver_free(AsyncServiceResolverInfo *i) {
     if (i->service_resolver)
         avahi_s_service_resolver_free(i->service_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(AsyncServiceResolverInfo, async_service_resolvers, i->client->async_service_resolvers, i);
 
     i->client->n_objects--;
@@ -145,7 +149,7 @@ DBusHandlerResult avahi_dbus_msg_async_service_resolver_impl(DBusConnection *c,
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "ServiceResolver.Introspect");
+        return avahi_dbus_handle_introspect(c, m, "ServiceResolver.introspect");
     
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))