Revert "Add a statically-initialized implementation of _dbus_lock() on glibc systems"

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

diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index 6cefe35..02a9571 100644 (file)
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-bus.h  Convenience functions for communicating with the bus.
  *
  * Copyright (C) 2003  CodeFactory AB
@@ -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)
@@ -31,44 +31,64 @@
 
 DBUS_BEGIN_DECLS
 
+/**
+ * @addtogroup DBusBus
+ * @{
+ */
+
+DBUS_EXPORT
 DBusConnection *dbus_bus_get              (DBusBusType     type,
                                           DBusError      *error);
+DBUS_EXPORT
 DBusConnection *dbus_bus_get_private      (DBusBusType     type,
                                           DBusError      *error);
 
+DBUS_EXPORT
 dbus_bool_t     dbus_bus_register         (DBusConnection *connection,
                                           DBusError      *error);
+DBUS_EXPORT
 dbus_bool_t     dbus_bus_set_unique_name  (DBusConnection *connection,
                                           const char     *unique_name);
+DBUS_EXPORT
 const char*     dbus_bus_get_unique_name  (DBusConnection *connection);
+DBUS_EXPORT
 unsigned long   dbus_bus_get_unix_user    (DBusConnection *connection,
                                           const char     *name,
                                            DBusError      *error);
+DBUS_EXPORT
+char*           dbus_bus_get_id           (DBusConnection *connection,
+                                           DBusError      *error);
+DBUS_EXPORT
 int             dbus_bus_request_name     (DBusConnection *connection,
                                           const char     *name,
                                           unsigned int    flags,
                                           DBusError      *error);
+DBUS_EXPORT
 int             dbus_bus_release_name     (DBusConnection *connection,
                                           const char     *name,
                                           DBusError      *error);
+DBUS_EXPORT
 dbus_bool_t     dbus_bus_name_has_owner   (DBusConnection *connection,
                                           const char     *name,
                                           DBusError      *error);
 
+DBUS_EXPORT
 dbus_bool_t     dbus_bus_start_service_by_name (DBusConnection *connection,
                                                 const char     *name,
                                                 dbus_uint32_t   flags,
                                                 dbus_uint32_t  *reply,
                                                 DBusError      *error);
 
+DBUS_EXPORT
 void            dbus_bus_add_match        (DBusConnection *connection,
                                            const char     *rule,
                                            DBusError      *error);
+DBUS_EXPORT
 void            dbus_bus_remove_match     (DBusConnection *connection,
                                            const char     *rule,
                                            DBusError      *error);
 
-void           _dbus_bus_check_connection_and_unref_unlocked (DBusConnection *connection);
+/** @} */
 
 DBUS_END_DECLS