Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / dbus / dbus-server.h

diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index ba9894e..4266ddc 100644 (file)
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -1,9 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-server.h DBusServer object
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 2.0
+ * Licensed under the Academic Free License version 2.1
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 #if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
@@ -32,49 +32,80 @@
 #include <dbus/dbus-connection.h>
 #include <dbus/dbus-protocol.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
+
+/**
+ * @addtogroup DBusServer
+ * @{
+ */
 
 typedef struct DBusServer DBusServer;
 
+/** Called when a new connection to the server is available. Must reference and save the new
+ * connection, or close the new connection. Set with dbus_server_set_new_connection_function().
+ */
 typedef void (* DBusNewConnectionFunction) (DBusServer     *server,
                                             DBusConnection *new_connection,
                                             void           *data);
 
+#ifdef ENABLE_KDBUS_TRANSPORT
+DBUS_EXPORT
+DBusServer* dbus_server_init_mini               (char* address);
+#endif
+
+DBUS_EXPORT
 DBusServer* dbus_server_listen           (const char     *address,
                                           DBusError      *error);
+DBUS_EXPORT
 DBusServer* dbus_server_ref              (DBusServer     *server);
+DBUS_EXPORT
 void        dbus_server_unref            (DBusServer     *server);
+DBUS_EXPORT
 void        dbus_server_disconnect       (DBusServer     *server);
+DBUS_EXPORT
 dbus_bool_t dbus_server_get_is_connected (DBusServer     *server);
+DBUS_EXPORT
 char*       dbus_server_get_address      (DBusServer     *server);
+DBUS_EXPORT
+char*       dbus_server_get_id           (DBusServer     *server);
+DBUS_EXPORT
 void        dbus_server_set_new_connection_function (DBusServer                *server,
                                                      DBusNewConnectionFunction  function,
                                                      void                      *data,
                                                      DBusFreeFunction           free_data_function);
+DBUS_EXPORT
 dbus_bool_t dbus_server_set_watch_functions         (DBusServer                *server,
                                                      DBusAddWatchFunction       add_function,
                                                      DBusRemoveWatchFunction    remove_function,
                                                      DBusWatchToggledFunction   toggled_function,
                                                      void                      *data,
                                                      DBusFreeFunction           free_data_function);
+DBUS_EXPORT
 dbus_bool_t dbus_server_set_timeout_functions       (DBusServer                *server,
                                                      DBusAddTimeoutFunction     add_function,
                                                      DBusRemoveTimeoutFunction  remove_function,
                                                      DBusTimeoutToggledFunction toggled_function,
                                                      void                      *data,
                                                      DBusFreeFunction           free_data_function);
+DBUS_EXPORT
 dbus_bool_t dbus_server_set_auth_mechanisms         (DBusServer                *server,
                                                      const char               **mechanisms);
 
+DBUS_EXPORT
 dbus_bool_t dbus_server_allocate_data_slot (dbus_int32_t     *slot_p);
+DBUS_EXPORT
 void        dbus_server_free_data_slot     (dbus_int32_t     *slot_p);
+DBUS_EXPORT
 dbus_bool_t dbus_server_set_data           (DBusServer       *server,
                                             int               slot,
                                             void             *data,
                                             DBusFreeFunction  free_data_func);
+DBUS_EXPORT
 void*       dbus_server_get_data           (DBusServer       *server,
                                             int               slot);
 
-DBUS_END_DECLS;
+/** @} */
+
+DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_H */