From 41f897e018ee55395441504c0cf3aef584527dd9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 28 Oct 2007 00:26:15 +0000 Subject: [PATCH] include avahi-gobject docs in doxygen git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1565 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- Makefile.am | 11 +++++++++++ avahi-common/defs.h | 16 +++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 23888b2..1173f2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,17 @@ if HAVE_GLIB DX_INPUT += \ $(srcdir)/avahi-glib/glib-watch.h \ $(srcdir)/avahi-glib/glib-malloc.h + +if HAVE_GOBJECT +DX_INPUT += \ + $(srcdir)/avahi-gobject/ga-client.h \ + $(srcdir)/avahi-gobject/ga-entry-group.h \ + $(srcdir)/avahi-gobject/ga-enums.h \ + $(srcdir)/avahi-gobject/ga-errors.h \ + $(srcdir)/avahi-gobject/ga-record-browser.h \ + $(srcdir)/avahi-gobject/ga-service-browser.h \ + $(srcdir)/avahi-gobject/ga-service-resolver.h +endif endif if HAVE_DBUS diff --git a/avahi-common/defs.h b/avahi-common/defs.h index a74fd6a..ddeaf9e 100644 --- a/avahi-common/defs.h +++ b/avahi-common/defs.h @@ -5,17 +5,17 @@ /*** 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 @@ -27,7 +27,7 @@ #include /** \mainpage - * + * * \section choose_api Choosing an API * * Avahi provides three programming APIs for integration of @@ -45,7 +45,9 @@ * \li avahi-client: a simplifying C wrapper around the D-Bus API. We * recommend using this API in C or C++ progams. The D-Bus internals * are hidden completely. - * + * \li avahi-gobject: an object-oriented C wrapper based on + * GLib's GObject. We recommd using this API for GNOME/Gtk programs. + * * All three APIs are very similar, however avahi-core is the most powerful. * * In addition to the three APIs described above Avahi supports two @@ -86,7 +88,7 @@ * files for all definitions that are part of the Avahi API. Please * note that these hidden definitions are considered part of the Avahi * API and will stay available in the API in the future. - * + * * \section error_reporting Error Reporting * * Some notes on the Avahi error handling: @@ -217,7 +219,7 @@ AVAHI_C_DECL_BEGIN /** States of a server object */ typedef enum { - AVAHI_SERVER_INVALID, /**< Invalid state (initial) */ + AVAHI_SERVER_INVALID, /**< Invalid state (initial) */ AVAHI_SERVER_REGISTERING, /**< 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() */ -- 2.39.2