X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-server.h;h=4266ddc8bb39da4d98bc9a5379bfa5e2444601b2;hb=7d9239c9c78cb6d0b9c282376fcf3cda1de23209;hp=756324403f6293fe6b80dc5e7643de6c857d48cd;hpb=b4a1100f4f81534e2aac0141afda750f318223d4;p=platform%2Fupstream%2Fdbus.git

diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index 7563244..4266ddc 100644
--- 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  Red Hat Inc.
+ * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * 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)
@@ -30,55 +30,82 @@
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-message.h>
 #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,
-                                          DBusResultCode *result);
-void        dbus_server_ref              (DBusServer     *server);
+                                          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_bool_t dbus_server_handle_watch                (DBusServer                *server,
-                                                     DBusWatch                 *watch,
-                                                     unsigned int               condition);
-void        dbus_server_set_max_connections         (DBusServer                *server,
-                                                     int                        max_connections);
-int         dbus_server_get_max_connections         (DBusServer                *server);
-int         dbus_server_get_n_connections           (DBusServer                *server);
-
+DBUS_EXPORT
+dbus_bool_t dbus_server_set_auth_mechanisms         (DBusServer                *server,
+                                                     const char               **mechanisms);
 
-int         dbus_server_allocate_data_slot (void);
-void        dbus_server_free_data_slot     (int               slot);
+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 */