From 8d38a2e2c5dc95de992c4d856ec1b0c0948bca3e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 29 Aug 2003 01:05:00 +0000 Subject: 2003-08-28 Havoc Pennington 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 --- glib/dbus-gproxy.c | 4 ++-- glib/dbus-gproxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'glib') diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c index 36f9724c..01a6b4b9 100644 --- a/glib/dbus-gproxy.c +++ b/glib/dbus-gproxy.c @@ -35,7 +35,7 @@ struct DBusGProxy DBusConnection *connection; char *service; char *interface; - DBusObjectID object_id; + char *path; }; #define LOCK_PROXY(proxy) (g_static_mutex_lock (&(proxy)->lock)) @@ -248,7 +248,7 @@ dbus_gproxy_send (DBusGProxy *proxy, { /* FIXME */ } - if (!dbus_object_id_is_null (&proxy->object_id)) + if (proxy->path) { /* FIXME */ } diff --git a/glib/dbus-gproxy.h b/glib/dbus-gproxy.h index f40ce8a0..4e8f3f60 100644 --- a/glib/dbus-gproxy.h +++ b/glib/dbus-gproxy.h @@ -42,8 +42,8 @@ DBusGProxy* dbus_gproxy_new_for_service_owner (DBusConnection *connect const char *service_name, const char *interface_name, GError **error); -DBusGProxy* dbus_gproxy_new_for_object_id (DBusConnection *connection, - const DBusObjectID *object_id, +DBusGProxy* dbus_gproxy_new_for_object_path (DBusConnection *connection, + const char *path, const char *interface_name); DBusGProxy* dbus_gproxy_new_for_interface (DBusConnection *connection, const char *interface_name); -- cgit