[rename] renamed kdbus related macros

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

diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index d1c2bfd..e8549e7 100644 (file)
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -1,9 +1,9 @@
-/* -*- 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
  *
- * 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)
@@ -28,16 +28,76 @@
 #define DBUS_BUS_H
 
 #include <dbus/dbus-connection.h>
+#ifdef ENABLE_KDBUS_TRANSPORT
+#include "dbus-address.h"
+#endif
+
+DBUS_BEGIN_DECLS
+
+/**
+ * @addtogroup DBusBus
+ * @{
+ */
+
+#ifdef ENABLE_KDBUS_TRANSPORT
+DBUS_EXPORT
+void                   dbus_bus_set_bus_connection_address(DBusBusType address_type, char* address);
+#endif
+
+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);
 
-char*       dbus_bus_register_client (DBusConnection *connection,
-                                      DBusError      *error);
-int         dbus_bus_acquire_service (DBusConnection *connection,
-                                     const char     *service_name,
-                                     unsigned int    flags,
-                                      DBusError      *error);
-dbus_bool_t dbus_bus_service_exists  (DBusConnection *connection,
-                                     const char     *service_name,
-                                      DBusError      *error);
+/** @} */
 
+DBUS_END_DECLS
 
 #endif /* DBUS_BUS_H */