2005-08-04 Colin Walters <walters@verbum.org>

	* 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.

1 files changed, 7 insertions, 6 deletions

diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index 9fd46020..ca1b5544 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -25,6 +25,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-signature.h>
 #include "dbus-gutils.h"
+#include "dbus-gsignature.h"
 #include "dbus-gvalue.h"
 #include "dbus-gvalue-utils.h"
 #include "dbus-gobject.h"
@@ -1551,7 +1552,7 @@ marshal_dbus_message_to_g_marshaller (GClosure     *closure,
     context.proxy = proxy;
 
     types = (const GType*) gsignature->data;
-    value_array = dbus_gvalue_demarshal_message (&context, message,
+    value_array = _dbus_gvalue_demarshal_message (&context, message,
 						 gsignature->len, types, NULL);
   }
 
@@ -1603,7 +1604,7 @@ dbus_g_proxy_emit_remote_signal (DBusGProxy  *proxy,
       if (gsignature == NULL)
 	goto out;
       
-      msg_gsignature = dbus_gtypes_from_arg_signature (dbus_message_get_signature (message),
+      msg_gsignature = _dbus_gtypes_from_arg_signature (dbus_message_get_signature (message),
 						       TRUE);
       for (i = 0; i < gsignature->len; i++)
 	{
@@ -2019,7 +2020,7 @@ dbus_g_proxy_marshal_args_to_message (DBusGProxy  *proxy,
 
       gvalue = g_value_array_get_nth (args, i);
 
-      if (!dbus_gvalue_marshal (&msgiter, gvalue))
+      if (!_dbus_gvalue_marshal (&msgiter, gvalue))
 	g_assert_not_reached ();
     }
   return message;
@@ -2143,7 +2144,7 @@ dbus_g_proxy_end_call_internal (DBusGProxy        *proxy,
 	  if (arg_type == DBUS_TYPE_VARIANT
 	      && g_type_is_a (valtype, G_TYPE_VALUE))
 	    {
-	      if (!dbus_gvalue_demarshal_variant (&context, &msgiter, (GValue*) return_storage, NULL))
+	      if (!_dbus_gvalue_demarshal_variant (&context, &msgiter, (GValue*) return_storage, NULL))
 		{
 		  g_set_error (error,
 			       DBUS_GERROR,
@@ -2157,11 +2158,11 @@ dbus_g_proxy_end_call_internal (DBusGProxy        *proxy,
 	    {
 	      g_value_init (&gvalue, valtype);
 
-	      if (!dbus_gvalue_demarshal (&context, &msgiter, &gvalue, error))
+	      if (!_dbus_gvalue_demarshal (&context, &msgiter, &gvalue, error))
 		goto out;
 
 	      /* Anything that can be demarshaled must be storable */
-	      if (!dbus_gvalue_store (&gvalue, (gpointer*) return_storage))
+	      if (!_dbus_gvalue_store (&gvalue, (gpointer*) return_storage))
 		g_assert_not_reached ();
 	      /* Ownership of the value passes to the client, don't unset */
 	    }