From f8c479234af6b676027df4fb6b38ce8e22949049 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Fri, 12 Aug 2005 04:49:23 +0000 Subject: * 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 --- avahi-client/client-test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'avahi-client/client-test.c') diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index 18997d5..4a0aa06 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -35,19 +35,19 @@ avahi_client_callback (AvahiClient *c, AvahiClientState state, void *user_data) } void -avahi_entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, void *user_data) +avahi_entry_group_callback (AvahiClientEntryGroup *g, AvahiEntryGroupState state, void *user_data) { printf ("XXX: Callback on %s, state -> %d, data -> %s\n", avahi_entry_group_path (g), state, (char*)user_data); } void -avahi_domain_browser_callback (AvahiDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *domain, void *user_data) +avahi_domain_browser_callback (AvahiClientDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *domain, void *user_data) { printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", avahi_domain_browser_path (b), interface, protocol, event, domain, (char*)user_data); } void -avahi_service_type_browser_callback (AvahiServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *type, char *domain, void *user_data) +avahi_service_type_browser_callback (AvahiClientServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *type, char *domain, void *user_data) { printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", avahi_service_type_browser_path (b), interface, protocol, event, type, domain, (char*)user_data); } @@ -56,10 +56,10 @@ main (int argc, char *argv[]) { GMainLoop *loop; AvahiClient *avahi; - AvahiEntryGroup *group; + AvahiClientEntryGroup *group; AvahiStringList *txt; - AvahiDomainBrowser *domain; - AvahiServiceTypeBrowser *st; + AvahiClientDomainBrowser *domain; + AvahiClientServiceTypeBrowser *st; char *ret; loop = g_main_loop_new (NULL, FALSE); -- cgit