From 4a48fff0c7c0377d68d1e24cc113e275057b4800 Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Mon, 13 Feb 2006 22:30:11 +0000 Subject: 2006-02-13 Robert McQueen * glib/dbus-binding-tool-glib.c, glib/dbus-gmain.c, glib/dbus-gsignature.c, glib/dbus-gtype-specialized.c, glib/dbus-gtype-specialized.h, glib/dbus-gvalue-utils.c, glib/dbus-gvalue-utils.h, glib/dbus-gvalue.c: Patch from Rob Taylor to add a big missing piece of the glib bindings jigsaw puzzle. This modifies the existing specialised types to have N type parameters (rather than the current 1 or 2 for arrays and dictionaries respectively). You can then use this to get a glib type to represent any arbitrary D-Bus struct type using dbus_g_type_get_struct. The only implementation of these types is with GValueArrays as before, but it's now possible to store these in arrays, emit them in signals, etc. --- glib/dbus-gmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'glib/dbus-gmain.c') diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 993bcf37..267f0bfa 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -754,14 +754,14 @@ _dbus_gmain_test (const char *test_data_dir) rectype = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GArray+guint")); + g_assert (!strcmp (g_type_name (rectype), "GArray_guint_")); type = _dbus_gtype_from_signature ("au", TRUE); g_assert (type == rectype); rectype = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GHashTable+gchararray+gchararray")); + g_assert (!strcmp (g_type_name (rectype), "GHashTable_gchararray+gchararray_")); type = _dbus_gtype_from_signature ("a{ss}", TRUE); g_assert (type == rectype); -- cgit