fix avahi-dnsconfd.c

[catta] / avahi-client / entrygroup.c

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 9760cd9a4b4f66afe026201938e6b7705e94c38b..ea56ee2591fc362ebeb76657ab20d59dcfc138ef 100644 (file)
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -45,7 +45,7 @@ void avahi_entry_group_state_change (AvahiEntryGroup *group, int state)
     if (group == NULL || group->callback == NULL)
         return;
 
-    group->callback (group->client, group, state, group->user_data);
+    group->callback (group, state, group->user_data);
 }
 
 AvahiEntryGroup*
@@ -143,7 +143,7 @@ avahi_entry_group_reset (AvahiEntryGroup *group)
 }
 
 int
-avahi_entry_group_state (AvahiEntryGroup *group)
+avahi_entry_group_get_state (AvahiEntryGroup *group)
 {
     DBusMessage *message, *reply;
     DBusError error;
@@ -181,7 +181,7 @@ avahi_entry_group_state (AvahiEntryGroup *group)
 int
 avahi_client_errno (AvahiClient *client)
 {
-    return client->errno;
+    return client->error;
 }
 
 AvahiClient*
@@ -204,7 +204,7 @@ avahi_entry_group_add_service (AvahiEntryGroup *group,
                                const char *type,
                                const char *domain,
                                const char *host,
-                               int port,
+                               uint16_t port,
                                AvahiStringList *txt)
 {
     DBusMessage *message;
@@ -249,7 +249,7 @@ avahi_entry_group_add_service (AvahiEntryGroup *group,
 }
 
 /* XXX: debug function */
-char* avahi_entry_group_get_path (AvahiEntryGroup *group)
+char* avahi_entry_group_path (AvahiEntryGroup *group)
 {
     if (group != NULL) return group->path;
     else return NULL;