2003-06-04 Havoc Pennington <hp@pobox.com>

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

diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index fc3a57e..5527f1e 100644 (file)
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
 /* 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
  * 
@@ -40,36 +40,30 @@ typedef void (* DBusNewConnectionFunction) (DBusServer     *server,
                                             void           *data);
 
 DBusServer* dbus_server_listen           (const char     *address,
-                                          DBusResultCode *result);
+                                          DBusError      *error);
 void        dbus_server_ref              (DBusServer     *server);
 void        dbus_server_unref            (DBusServer     *server);
 void        dbus_server_disconnect       (DBusServer     *server);
 dbus_bool_t dbus_server_get_is_connected (DBusServer     *server);
-
-void dbus_server_set_new_connection_function (DBusServer                *server,
-                                              DBusNewConnectionFunction  function,
-                                              void                      *data,
-                                              DBusFreeFunction           free_data_function);
-void dbus_server_set_watch_functions         (DBusServer                *server,
-                                              DBusAddWatchFunction       add_function,
-                                              DBusRemoveWatchFunction    remove_function,
-                                              void                      *data,
-                                              DBusFreeFunction           free_data_function);
-void dbus_server_set_timeout_functions       (DBusServer                *server,
-                                             DBusAddTimeoutFunction     add_function,
-                                             DBusRemoveTimeoutFunction  remove_function,
-                                             void                      *data,
-                                             DBusFreeFunction           free_data_function);
-void 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);
+char*       dbus_server_get_address      (DBusServer     *server);
+void        dbus_server_set_new_connection_function (DBusServer                *server,
+                                                     DBusNewConnectionFunction  function,
+                                                     void                      *data,
+                                                     DBusFreeFunction           free_data_function);
+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_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_set_auth_mechanisms         (DBusServer                *server,
+                                                     const char               **mechanisms);
 
 int         dbus_server_allocate_data_slot (void);
 void        dbus_server_free_data_slot     (int               slot);