* Revert revision 303 (Name space changes) as avahi-core has now been changed.

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@315 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 13 insertions, 13 deletions

diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index 4feffc0..ad39af3 100644
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -30,38 +30,38 @@ struct _AvahiClient
     int error;
     AvahiClientCallback callback;
     void *user_data;
-    AVAHI_LLIST_HEAD(AvahiClientEntryGroup, groups);
-    AVAHI_LLIST_HEAD(AvahiClientDomainBrowser, domain_browsers);
-    AVAHI_LLIST_HEAD(AvahiClientServiceTypeBrowser, service_type_browsers);
+    AVAHI_LLIST_HEAD(AvahiEntryGroup, groups);
+    AVAHI_LLIST_HEAD(AvahiDomainBrowser, domain_browsers);
+    AVAHI_LLIST_HEAD(AvahiServiceTypeBrowser, service_type_browsers);
 };
 
-struct _AvahiClientEntryGroup {
+struct _AvahiEntryGroup {
     char *path;
     AvahiClient *client;
-    AvahiClientEntryGroupCallback callback;
+    AvahiEntryGroupCallback callback;
     void *user_data;
-    AVAHI_LLIST_FIELDS(AvahiClientEntryGroup, groups);
+    AVAHI_LLIST_FIELDS(AvahiEntryGroup, groups);
 };
 
-struct _AvahiClientDomainBrowser {
+struct _AvahiDomainBrowser {
     char *path;
     AvahiClient *client;
-    AvahiClientDomainBrowserCallback callback;
+    AvahiDomainBrowserCallback callback;
     void *user_data;
-    AVAHI_LLIST_FIELDS(AvahiClientDomainBrowser, domain_browsers);
+    AVAHI_LLIST_FIELDS(AvahiDomainBrowser, domain_browsers);
 };
 
-struct _AvahiClientServiceTypeBrowser {
+struct _AvahiServiceTypeBrowser {
     char *path;
     AvahiClient *client;
-    AvahiClientServiceTypeBrowserCallback callback;
+    AvahiServiceTypeBrowserCallback callback;
     void *user_data;
-    AVAHI_LLIST_FIELDS(AvahiClientServiceTypeBrowser, service_type_browsers);
+    AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, service_type_browsers);
 };
 
 int avahi_client_set_errno (AvahiClient *client, int error);
 
-void avahi_entry_group_state_change (AvahiClientEntryGroup *group, int state);
+void avahi_entry_group_state_change (AvahiEntryGroup *group, int state);
 
 DBusHandlerResult avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message);