summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-08-29 01:05:00 +0000
committerHavoc Pennington <hp@redhat.com>2003-08-29 01:05:00 +0000
commit8d38a2e2c5dc95de992c4d856ec1b0c0948bca3e (patch)
tree6df0de00f2b7d8da4623c2d31932d45deb39ca93 /dbus/dbus-marshal.h
parent24f411a6a10e4838f57595720642ce83ceae814c (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-marshal.h')
-rw-r--r--dbus/dbus-marshal.h30
1 files changed, 16 insertions, 14 deletions
diff --git a/dbus/dbus-marshal.h b/dbus/dbus-marshal.h
index af18876a..27ded007 100644
--- a/dbus/dbus-marshal.h
+++ b/dbus/dbus-marshal.h
@@ -29,7 +29,6 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-arch-deps.h>
#include <dbus/dbus-string.h>
-#include <dbus/dbus-objectid.h>
#ifndef PACKAGE
#error "config.h not included here"
@@ -154,15 +153,16 @@ void _dbus_marshal_set_uint64 (DBusString *str,
dbus_uint64_t value);
#endif /* DBUS_HAVE_INT64 */
-dbus_bool_t _dbus_marshal_set_string (DBusString *str,
- int byte_order,
- int offset,
- const DBusString *value,
- int len);
-void _dbus_marshal_set_object_id (DBusString *str,
- int byte_order,
- int offset,
- const DBusObjectID *value);
+dbus_bool_t _dbus_marshal_set_string (DBusString *str,
+ int byte_order,
+ int offset,
+ const DBusString *value,
+ int len);
+void _dbus_marshal_set_object_path (DBusString *str,
+ int byte_order,
+ int offset,
+ const char **path,
+ int path_len);
dbus_bool_t _dbus_marshal_int32 (DBusString *str,
int byte_order,
@@ -214,9 +214,10 @@ dbus_bool_t _dbus_marshal_string_array (DBusString *str,
int byte_order,
const char **value,
int len);
-dbus_bool_t _dbus_marshal_object_id (DBusString *str,
+dbus_bool_t _dbus_marshal_object_path (DBusString *str,
int byte_order,
- const DBusObjectID *value);
+ const char **path,
+ int path_len);
double _dbus_demarshal_double (const DBusString *str,
int byte_order,
@@ -288,11 +289,12 @@ dbus_bool_t _dbus_demarshal_string_array (const DBusString *str,
int *new_pos,
char ***array,
int *array_len);
-void _dbus_demarshal_object_id (const DBusString *str,
+dbus_bool_t _dbus_demarshal_object_path (const DBusString *str,
int byte_order,
int pos,
int *new_pos,
- DBusObjectID *value);
+ char ***path,
+ int *path_len);
dbus_bool_t _dbus_marshal_get_arg_end_pos (const DBusString *str,
int byte_order,