summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-connection.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-07-17 01:10:57 +0000
committerHavoc Pennington <hp@redhat.com>2003-07-17 01:10:57 +0000
commit8b7fe6f99dd35f32443a4e23466c8a1e4cfaa32b (patch)
tree8b256d8b7b09c0c0360ea10075ba0962a1874b51 /dbus/dbus-connection.c
parentf1ee877d76000920e6dbec1b59be1ffab39d2c81 (diff)
2003-07-13 Havoc Pennington <hp@pobox.com>
* dbus/dbus-object.h (struct DBusObjectVTable): add padding fields to DBusObjectVTable and DBusObjectInfo
Diffstat (limited to 'dbus/dbus-connection.c')
-rw-r--r--dbus/dbus-connection.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 104fd41f..d604bfcb 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -2791,8 +2791,12 @@ dbus_connection_register_object (DBusConnection *connection,
void *object_impl,
DBusObjectID *object_id)
{
- _dbus_return_val_if_fail (connection != NULL, FALSE);
-
+ _dbus_return_val_if_fail (connection != NULL, FALSE);
+ _dbus_return_val_if_fail (vtable != NULL, FALSE);
+ _dbus_return_val_if_fail (vtable->dbus_internal_pad1 == NULL);
+ _dbus_return_val_if_fail (vtable->dbus_internal_pad2 == NULL);
+ _dbus_return_val_if_fail (vtable->dbus_internal_pad3 == NULL);
+
CONNECTION_LOCK (connection);
return _dbus_object_registry_add_and_unlock (connection->objects,