summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-connection.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-07-09 03:41:00 +0000
committerHavoc Pennington <hp@redhat.com>2003-07-09 03:41:00 +0000
commit824d4a5edfe1fa7222ab5cb49928bf78a675b563 (patch)
tree67e3e45df77fc7fa4277507895cf650ce7f61917 /dbus/dbus-connection.h
parentd8abf955f5bff3e83cabd267883039f7a42c98c3 (diff)
2003-07-08 Havoc Pennington <hp@pobox.com>
* dbus/dbus-object.c: implement some of this * dbus/dbus-object-registry.c (_dbus_object_registry_add_and_unlock): fill in the object_id out param (_dbus_object_registry_new): handle OOM
Diffstat (limited to 'dbus/dbus-connection.h')
-rw-r--r--dbus/dbus-connection.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index ce57c98d..6c0da920 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -28,12 +28,11 @@
#define DBUS_CONNECTION_H
#include <dbus/dbus-errors.h>
-#include <dbus/dbus-message.h>
#include <dbus/dbus-memory.h>
+#include <dbus/dbus-object.h>
DBUS_BEGIN_DECLS;
-typedef struct DBusConnection DBusConnection;
typedef struct DBusWatch DBusWatch;
typedef struct DBusTimeout DBusTimeout;
typedef struct DBusMessageHandler DBusMessageHandler;
@@ -172,7 +171,17 @@ void dbus_connection_unregister_handler (DBusConnection *connection,
const char **messages_to_handle,
int n_messages);
+/* Objects */
+dbus_bool_t dbus_connection_register_object (DBusConnection *connection,
+ const char **interfaces,
+ const DBusObjectVTable *vtable,
+ void *object_impl,
+ DBusObjectID *object_id);
+void dbus_connection_unregister_object (DBusConnection *connection,
+ const DBusObjectID *object_id);
+
+/* Other */
dbus_bool_t dbus_connection_allocate_data_slot (dbus_int32_t *slot_p);
void dbus_connection_free_data_slot (dbus_int32_t *slot_p);
dbus_bool_t dbus_connection_set_data (DBusConnection *connection,