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-gvalue.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'glib/dbus-gvalue.h') diff --git a/glib/dbus-gvalue.h b/glib/dbus-gvalue.h index 99cfd07b..3b41747e 100644 --- a/glib/dbus-gvalue.h +++ b/glib/dbus-gvalue.h @@ -14,36 +14,27 @@ typedef struct { DBusGProxy *proxy; } DBusGValueMarshalCtx; -void dbus_g_value_types_init (void); +void _dbus_g_value_types_init (void); -GType dbus_gtype_from_signature (const char *signature, - gboolean is_client); +char * _dbus_gtype_to_signature (GType type); -GType dbus_gtype_from_signature_iter (DBusSignatureIter *sigiter, - gboolean is_client); - -char * dbus_gtype_to_signature (GType type); - -GArray * dbus_gtypes_from_arg_signature (const char *signature, - gboolean is_client); - -gboolean dbus_gvalue_demarshal (DBusGValueMarshalCtx *context, +gboolean _dbus_gvalue_demarshal (DBusGValueMarshalCtx *context, DBusMessageIter *iter, GValue *value, GError **error); -gboolean dbus_gvalue_demarshal_variant (DBusGValueMarshalCtx *context, +gboolean _dbus_gvalue_demarshal_variant (DBusGValueMarshalCtx *context, DBusMessageIter *iter, GValue *value, GError **error); -GValueArray * dbus_gvalue_demarshal_message (DBusGValueMarshalCtx *context, +GValueArray * _dbus_gvalue_demarshal_message (DBusGValueMarshalCtx *context, DBusMessage *message, guint n_params, const GType *types, GError **error); -gboolean dbus_gvalue_marshal (DBusMessageIter *iter, +gboolean _dbus_gvalue_marshal (DBusMessageIter *iter, const GValue *value); G_END_DECLS -- cgit