diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-08-29 01:05:00 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-08-29 01:05:00 +0000 |
| commit | 8d38a2e2c5dc95de992c4d856ec1b0c0948bca3e (patch) | |
| tree | 6df0de00f2b7d8da4623c2d31932d45deb39ca93 /dbus/dbus-objectid.h | |
| parent | 24f411a6a10e4838f57595720642ce83ceae814c (diff) | |
2003-08-28 Havoc Pennington <hp@pobox.com>
purge DBusObjectID
* dbus/dbus-connection.c: port to no ObjectID, create a
DBusObjectTree, rename ObjectTree to ObjectPath in public API
* dbus/dbus-connection.h (struct DBusObjectTreeVTable): delete
everything except UnregisterFunction and MessageFunction
* dbus/dbus-marshal.c: port away from DBusObjectID,
add DBUS_TYPE_OBJECT_PATH
* dbus/dbus-object-registry.[hc], dbus/dbus-object.[hc],
dbus/dbus-objectid.[hc]: remove these, we are moving to
path-based object IDs
Diffstat (limited to 'dbus/dbus-objectid.h')
| -rw-r--r-- | dbus/dbus-objectid.h | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/dbus/dbus-objectid.h b/dbus/dbus-objectid.h deleted file mode 100644 index 9539f9be..00000000 --- a/dbus/dbus-objectid.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ -/* dbus-objectid.h DBusObjectID type - * - * Copyright (C) 2003 Red Hat Inc. - * - * Licensed under the Academic Free License version 1.2 - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * - */ -#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION) -#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents." -#endif - -#ifndef DBUS_OBJECTID_H -#define DBUS_OBJECTID_H - -#include <dbus/dbus-arch-deps.h> -#include <dbus/dbus-types.h> - -DBUS_BEGIN_DECLS; - -typedef struct DBusObjectID DBusObjectID; - -struct DBusObjectID -{ -#ifdef DBUS_HAVE_INT64 - dbus_uint64_t dbus_do_not_use_dummy1; -#else - dbus_uint32_t dbus_do_not_use_dummy2; - dbus_uint32_t dbus_do_not_use_dummy3; -#endif -}; - -dbus_bool_t dbus_object_id_equal (const DBusObjectID *a, - const DBusObjectID *b); -int dbus_object_id_compare (const DBusObjectID *a, - const DBusObjectID *b); -dbus_uint16_t dbus_object_id_get_server_bits (const DBusObjectID *obj_id); -dbus_uint16_t dbus_object_id_get_client_bits (const DBusObjectID *obj_id); -dbus_uint32_t dbus_object_id_get_connection_bits (const DBusObjectID *obj_id); -dbus_bool_t dbus_object_id_get_is_server_bit (const DBusObjectID *obj_id); -dbus_uint32_t dbus_object_id_get_instance_bits (const DBusObjectID *obj_id); -void dbus_object_id_set_server_bits (DBusObjectID *obj_id, - dbus_uint16_t value); -void dbus_object_id_set_client_bits (DBusObjectID *obj_id, - dbus_uint16_t value); -void dbus_object_id_set_is_server_bit (DBusObjectID *obj_id, - dbus_bool_t value); -void dbus_object_id_set_instance_bits (DBusObjectID *obj_id, - dbus_uint32_t value); -void dbus_object_id_set_null (DBusObjectID *obj_id); -dbus_bool_t dbus_object_id_is_null (const DBusObjectID *obj_id); - -#ifdef DBUS_HAVE_INT64 -dbus_uint64_t dbus_object_id_get_as_integer (const DBusObjectID *obj_id); -void dbus_object_id_set_as_integer (DBusObjectID *obj_id, - dbus_uint64_t value); -#endif - -DBUS_END_DECLS; - -#endif /* DBUS_OBJECTID_H */ |