From 8c7bbdbaea747f465676380eae4104607ef99696 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 4 Aug 2005 15:49:30 +0000 Subject: 2005-08-04 Colin Walters * glib/dbus-gvalue-utils.h (_dbus_g_type_specialized_builtins_init) (dbus_g_type_is_fixed, dbus_g_type_fixed_get_size) (dbus_gvalue_set_from_pointer, dbus_g_hash_table_value_foreach) (dbus_g_hash_table_insert_values, dbus_g_hash_table_insert_steal_values) (dbus_gtype_is_valid_hash_key, dbus_gtype_is_valid_hash_value) (dbus_g_hash_func_from_gtype, dbus_g_hash_free_from_gtype) (dbus_g_hash_equal_from_gtype, dbus_gvalue_stor, dbus_gvalue_take): * glib/dbus-gvalue.h (dbus_g_value_types_init) (dbus_gvalue_demarshal, dbus_gvalue_demarshal_variant) (dbus_gvalue_demarshal_message, dbus_gvalue_marshal): Prefix name with _ to ensure they're not exported. All callers updated. * glib/dbus-gvalue.c (typecode_to_gtype) (dbus_typecode_maps_to_basic, basic_typecode_to_gtype) (signature_iter_to_g_type_dict) (signature_iter_to_g_type_array) (dbus_gtype_from_signature_iter, dbus_gtype_from_signature) (dbus_gtypes_from_arg_signature): Move to dbus-gsignature.c. * glib/dbus-binding-tool-glib.c (dbus_binding_tool_output_glib_server): Call dbus_g_type_specialized_builtins_init instead of dbus_g_value_types_init. (dbus_binding_tool_output_glib_client): Ditto. * glib/Makefile.am (DBUS_GLIB_INTERNALS): Add dbus-gsignature.c and dbus-gsignature.h * test/glib/test-service-glib.c (my_object_rec_arrays): Delete unused variable. --- glib/dbus-gmain.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'glib/dbus-gmain.c') diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 85d7bca1..4904588e 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -30,6 +30,7 @@ #include "dbus-gvalue.h" #include "dbus-gobject.h" #include "dbus-gvalue-utils.h" +#include "dbus-gsignature.h" #include #include @@ -714,7 +715,7 @@ dbus_g_bus_get (DBusBusType type, g_return_val_if_fail (error == NULL || *error == NULL, NULL); - dbus_g_value_types_init (); + _dbus_g_value_types_init (); dbus_error_init (&derror); @@ -744,30 +745,30 @@ dbus_g_bus_get (DBusBusType type, gboolean _dbus_gmain_test (const char *test_data_dir) { + GType type; GType rectype; - GType gtype; g_type_init (); - dbus_g_value_types_init (); + _dbus_g_value_types_init (); 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")); - gtype = dbus_gtype_from_signature ("au", TRUE); - g_assert (gtype == rectype); + 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")); - gtype = dbus_gtype_from_signature ("a{ss}", TRUE); - g_assert (gtype == rectype); + type = _dbus_gtype_from_signature ("a{ss}", TRUE); + g_assert (type == rectype); - gtype = dbus_gtype_from_signature ("o", FALSE); - g_assert (gtype == DBUS_TYPE_G_OBJECT_PATH); - gtype = dbus_gtype_from_signature ("o", TRUE); - g_assert (gtype == DBUS_TYPE_G_OBJECT_PATH); + type = _dbus_gtype_from_signature ("o", FALSE); + g_assert (type == DBUS_TYPE_G_OBJECT_PATH); + type = _dbus_gtype_from_signature ("o", TRUE); + g_assert (type == DBUS_TYPE_G_OBJECT_PATH); return TRUE; } -- cgit