2005-02-17 Colin Walters <walters@verbum.org>

	* glib/dbus-gobject.h: Don't export
	_dbus_glib_marshal_dbus_message_to_gvalue_array.

	* glib/dbus-gobject.c (_dbus_glib_marshal_dbus_message_to_gvalue_array): Do rename.
	(invoke_object_method): Handle it.

	* glib/dbus-gproxy.c (marshal_dbus_message_to_g_marshaller):
	Handle rename.

diff --git a/ChangeLog b/ChangeLog
index edd4ed59519b89a49a3c869a4e95dc630f8c8bd6..bf719830564fec4e831a92500ad7245d0f3d36ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-17  Colin Walters  <walters@verbum.org>
+
+       * glib/dbus-gobject.h: Don't export
+       _dbus_glib_marshal_dbus_message_to_gvalue_array.
+       
+       * glib/dbus-gobject.c (_dbus_glib_marshal_dbus_message_to_gvalue_array): Do rename.
+       (invoke_object_method): Handle it.
+
+       * glib/dbus-gproxy.c (marshal_dbus_message_to_g_marshaller):
+       Handle rename.
+       
 2005-02-17  Colin Walters  <walters@verbum.org>
 
        * bus/.cvsignore, doc/.cvsignore

diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 96eec473b7c865ef95fe7e11d4158ba30126f28c..cf10e8d12d386b472a12da84d50eb07eefb578e0 100644 (file)
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -200,7 +200,7 @@ method_output_signature_from_object_info (const DBusGObjectInfo *object,
 }
 
 GValueArray *
-dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage         *message)
+_dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage         *message)
 {
   GValueArray *ret;
   DBusMessageIter iter;
@@ -818,7 +818,7 @@ invoke_object_method (GObject         *object,
   memset (&closure, 0, sizeof (closure));
   
   /* Convert method IN parameters to GValueArray */
-  value_array = dbus_glib_marshal_dbus_message_to_gvalue_array (message);
+  value_array = _dbus_glib_marshal_dbus_message_to_gvalue_array (message);
 
   g_return_val_if_fail (value_array != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 

diff --git a/glib/dbus-gobject.h b/glib/dbus-gobject.h
index 28bba5c3806c5e29fdb0ab13bc34e4b72be95ee0..6c78546a80bf7a24e65ab7004be6551d28f99cb1 100644 (file)
--- a/glib/dbus-gobject.h
+++ b/glib/dbus-gobject.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-GValueArray*       dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage         *message);
+GValueArray*       _dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage         *message);
 
 G_END_DECLS
 

diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index 8967ccd22d92b37f87ab158c5d7b1a403be0d712..65f14e12eb0ac4af02aa3cd2bdd414acfb47e1b8 100644 (file)
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -922,7 +922,7 @@ marshal_dbus_message_to_g_marshaller (GClosure     *closure,
 
   g_return_if_fail (c_marshaller != NULL);
   
-  value_array = dbus_glib_marshal_dbus_message_to_gvalue_array (message);
+  value_array = _dbus_glib_marshal_dbus_message_to_gvalue_array (message);
 
   g_return_if_fail (value_array != NULL);