* First set of changes for new avahi-client, move some core.h enum defs

   into a new avahi-common/defs.h for use with the client wrapper.
 * Add avahi-common/defs.h to doxygen config

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

diff --git a/avahi-common/defs.h b/avahi-common/defs.h
new file mode 100644 (file)
index 0000000..6cef4a3
--- /dev/null
+++ b/avahi-common/defs.h
@@ -0,0 +1,69 @@
+#ifndef foodefshfoo
+#define foodefshfoo
+
+/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#include <avahi-common/cdecl.h>
+
+AVAHI_C_DECL_BEGIN
+
+/** States of an entry group object */
+typedef enum {
+    AVAHI_ENTRY_GROUP_UNCOMMITED = -1,   /**< The group has not yet been commited, the user must still call avahi_entry_group_commit() */
+    AVAHI_ENTRY_GROUP_REGISTERING = 0,   /**< The entries of the group are currently being registered */
+    AVAHI_ENTRY_GROUP_ESTABLISHED,       /**< The entries have successfully been established */
+    AVAHI_ENTRY_GROUP_COLLISION          /**< A name collision for one of the entries in the group has been detected, the entries have been withdrawn */ 
+} AvahiEntryGroupState;
+
+/** The type of domain to browse for */
+typedef enum {
+    AVAHI_DOMAIN_BROWSER_REGISTER,          /**< Browse for a list of available registering domains */
+    AVAHI_DOMAIN_BROWSER_REGISTER_DEFAULT,  /**< Browse for the default registering domain */
+    AVAHI_DOMAIN_BROWSER_BROWSE,            /**< Browse for a list of available browsing domains */
+    AVAHI_DOMAIN_BROWSER_BROWSE_DEFAULT,    /**< Browse for the default browsing domain */
+    AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY,     /**< Legacy browse domain - see DNS-SD spec for more information */
+    AVAHI_DOMAIN_BROWSER_MAX
+} AvahiDomainBrowserType;
+
+/** Type of callback event when browsing */
+typedef enum {
+    AVAHI_BROWSER_NEW = 0,            /**< The object is new on the network */
+    AVAHI_BROWSER_REMOVE = -1         /**< The object has been removed from the network */
+} AvahiBrowserEvent;
+
+/** Type of callback event when resolving */
+typedef enum {
+    AVAHI_RESOLVER_FOUND = 0,         /**< RR found, resolving successful */
+    AVAHI_RESOLVER_TIMEOUT = -1       /**< Noone responded within the timeout, resolving failed */
+} AvahiResolverEvent;
+
+/** States of a server object */
+typedef enum {
+    AVAHI_SERVER_INVALID = -1,     /**< Invalid state (initial) */ 
+    AVAHI_SERVER_REGISTERING = 0,  /**< Host RRs are being registered */
+    AVAHI_SERVER_RUNNING,          /**< All host RRs have been established */
+    AVAHI_SERVER_COLLISION         /**< There is a collision with a host RR. All host RRs have been withdrawn, the user should set a new host name via avahi_server_set_host_name() */
+} AvahiServerState;
+
+AVAHI_C_DECL_END
+
+#endif

diff --git a/avahi-core/core.h b/avahi-core/core.h
index 2951f6d34efc41f381a096e8f28bc4ce950ffb68..59f28527b097ef18a1ea7424bdc5523bb20a7170 100644 (file)
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -34,6 +34,7 @@
  * services using an embedded mDNS stack. */
 
 #include <avahi-common/cdecl.h>
+#include <avahi-common/defs.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
@@ -87,14 +88,6 @@ enum {
     AVAHI_ERR_MAX = -22
 };
 
-/** States of a server object */
-typedef enum {
-    AVAHI_SERVER_INVALID = -1,     /**< Invalid state (initial) */ 
-    AVAHI_SERVER_REGISTERING = 0,  /**< Host RRs are being registered */
-    AVAHI_SERVER_RUNNING,          /**< All host RRs have been established */
-    AVAHI_SERVER_COLLISION         /**< There is a collision with a host RR. All host RRs have been withdrawn, the user should set a new host name via avahi_server_set_host_name() */
-} AvahiServerState;
-
 /** Flags for server entries */
 typedef enum {
     AVAHI_ENTRY_NULL = 0,          /**< No special flags */
@@ -104,14 +97,6 @@ typedef enum {
     AVAHI_ENTRY_ALLOWMUTIPLE = 8   /**< Allow multiple local records of this type, even if they are intended to be unique */
 } AvahiEntryFlags;
 
-/** States of an entry group object */
-typedef enum {
-    AVAHI_ENTRY_GROUP_UNCOMMITED = -1,   /**< The group has not yet been commited, the user must still call avahi_entry_group_commit() */
-    AVAHI_ENTRY_GROUP_REGISTERING = 0,   /**< The entries of the group are currently being registered */
-    AVAHI_ENTRY_GROUP_ESTABLISHED,       /**< The entries have successfully been established */
-    AVAHI_ENTRY_GROUP_COLLISION          /**< A name collision for one of the entries in the group has been detected, the entries have been withdrawn */ 
-} AvahiEntryGroupState;
-
 /** Prototype for callback functions which are called whenever the state of an AvahiServer object changes */
 typedef void (*AvahiServerCallback) (AvahiServer *s, AvahiServerState state, gpointer userdata);
 
@@ -393,18 +378,6 @@ gint avahi_server_add_dns_server_name(
     const gchar *name,
     guint16 port /** should be 53 */);
 
-/** Type of callback event when browsing */
-typedef enum {
-    AVAHI_BROWSER_NEW = 0,            /**< The object is new on the network */
-    AVAHI_BROWSER_REMOVE = -1         /**< The object has been removed from the network */
-} AvahiBrowserEvent;
-
-/** Type of callback event when resolving */
-typedef enum {
-    AVAHI_RESOLVER_FOUND = 0,         /**< RR found, resolving successful */
-    AVAHI_RESOLVER_TIMEOUT = -1       /**< Noone responded within the timeout, resolving failed */
-} AvahiResolverEvent;
-
 /** A browsing object for arbitrary RRs */
 typedef struct AvahiRecordBrowser AvahiRecordBrowser;
 
@@ -480,16 +453,6 @@ AvahiAddressResolver *avahi_address_resolver_new(
 /** Free an AvahiAddressResolver object */
 void avahi_address_resolver_free(AvahiAddressResolver *r);
 
-/** The type of domain to browse for */
-typedef enum {
-    AVAHI_DOMAIN_BROWSER_REGISTER,          /**< Browse for a list of available registering domains */
-    AVAHI_DOMAIN_BROWSER_REGISTER_DEFAULT,  /**< Browse for the default registering domain */
-    AVAHI_DOMAIN_BROWSER_BROWSE,            /**< Browse for a list of available browsing domains */
-    AVAHI_DOMAIN_BROWSER_BROWSE_DEFAULT,    /**< Browse for the default browsing domain */
-    AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY,     /**< Legacy browse domain - see DNS-SD spec for more information */
-    AVAHI_DOMAIN_BROWSER_MAX
-} AvahiDomainBrowserType;
-
 /** A local domain browsing object. May be used to enumerate domains used on the local LAN */
 typedef struct AvahiDomainBrowser AvahiDomainBrowser;
 

diff --git a/doxygen.cfg b/doxygen.cfg
index 315fbd1eb76b95720a2d7d929cc04fe2274e4814..4c426f03f17bf5aea2e87b1006f7e4c56f815841 100644 (file)
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -67,7 +67,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = $(SRCDIR)/avahi-common/cdecl.h $(SRCDIR)/avahi-core/core.h $(SRCDIR)/avahi-common/address.h $(SRCDIR)/avahi-common/rr.h $(SRCDIR)/avahi-common/strlst.h $(SRCDIR)/avahi-common/alternative.h $(SRCDIR)/avahi-core/log.h
+INPUT                  = $(SRCDIR)/avahi-common/cdecl.h $(SRCDIR)/avahi-core/core.h $(SRCDIR)/avahi-common/address.h $(SRCDIR)/avahi-common/rr.h $(SRCDIR)/avahi-common/strlst.h $(SRCDIR)/avahi-common/alternative.h $(SRCDIR)/avahi-core/log.h $(SRCDIR)/avahi-common/defs.h
 FILE_PATTERNS          =
 RECURSIVE              = NO
 EXCLUDE                =