* Rename various data structures to prevent a namespace conflict with avahi-core

[catta] / avahi-client / client-test.c

diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c
index f55d1e44fdf5b1539a4759e9c55faed4fa1944e5..4a0aa068c410417d40fc6decd56a665475247316 100644 (file)
--- a/avahi-client/client-test.c
+++ b/avahi-client/client-test.c
@@ -19,6 +19,10 @@
   USA.
 ***/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <avahi-client/client.h>
 #include <avahi-common/error.h>
 #include <stdio.h>
@@ -31,25 +35,31 @@ 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, event -> %d, domain -> %s, data -> %s\n", avahi_domain_browser_path (b), event, domain, (char*)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 (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);
+}
 int
 main (int argc, char *argv[])
 {
     GMainLoop *loop;
     AvahiClient *avahi;
-    AvahiEntryGroup *group;
+    AvahiClientEntryGroup *group;
     AvahiStringList *txt;
-    AvahiDomainBrowser *domain;
+    AvahiClientDomainBrowser *domain;
+    AvahiClientServiceTypeBrowser *st;
     char *ret;
 
     loop = g_main_loop_new (NULL, FALSE);
@@ -93,7 +103,14 @@ main (int argc, char *argv[])
     if (domain == NULL)
         printf ("Failed to create domain browser object\n");
     else
-        printf ("Sucessfully created browser, path %s\n", avahi_domain_browser_path (domain));
+        printf ("Sucessfully created domain browser, path %s\n", avahi_domain_browser_path (domain));
+
+    st = avahi_service_type_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "", avahi_service_type_browser_callback, "omghai3u");
+    if (st == NULL)
+        printf ("Failed to create service type browser object\n");
+    else
+        printf ("Sucessfully created service type browser, path %s\n", avahi_service_type_browser_path (st));
+
 
     g_main_loop_run (loop);