diff options
author | Trent Lloyd <lathiat@bur.st> | 2005-08-12 04:49:23 +0000 |
---|---|---|
committer | Trent Lloyd <lathiat@bur.st> | 2005-08-12 04:49:23 +0000 |
commit | f8c479234af6b676027df4fb6b38ce8e22949049 (patch) | |
tree | 525343662616f78699bc46dc4faa4bbe3f3a55c1 /avahi-client/client.c | |
parent | bca16ea33da4246188a710dcb07bb6b352ca9cf4 (diff) |
* Rename various data structures to prevent a namespace conflict with avahi-core
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@304 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-client/client.c')
-rw-r--r-- | avahi-client/client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-client/client.c b/avahi-client/client.c index 49c82d5..3bac33c 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -147,7 +147,7 @@ filter_func (DBusConnection *bus, DBusMessage *message, void *data) printf ("server statehcange\n"); } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "StateChanged")) { const char *path; - AvahiEntryGroup *n, *group = NULL; + AvahiClientEntryGroup *n, *group = NULL; path = dbus_message_get_path (message); for (n = client->groups; n != NULL; n = n->groups_next) @@ -202,9 +202,9 @@ avahi_client_new (AvahiClientCallback callback, void *user_data) if (!(tmp = malloc(sizeof(AvahiClient)))) goto fail; - AVAHI_LLIST_HEAD_INIT(AvahiEntryGroup, tmp->groups); - AVAHI_LLIST_HEAD_INIT(AvahiDomainBrowser, tmp->domain_browsers); - AVAHI_LLIST_HEAD_INIT(AvahiServieTypeBrowser, tmp->service_type_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiClientEntryGroup, tmp->groups); + AVAHI_LLIST_HEAD_INIT(AvahiClientDomainBrowser, tmp->domain_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiClientServiceTypeBrowser, tmp->service_type_browsers); tmp->bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); |