From 74ae666f06076e8ebd9bc8267e3b824ef042b0ab Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 18 Feb 2005 03:14:33 +0000 Subject: 2005-02-17 Colin Walters * 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. --- ChangeLog | 11 +++++++++++ glib/dbus-gobject.c | 4 ++-- glib/dbus-gobject.h | 2 +- glib/dbus-gproxy.c | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index edd4ed59..bf719830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-02-17 Colin Walters + + * 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 * bus/.cvsignore, doc/.cvsignore diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c index 96eec473..cf10e8d1 100644 --- 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 28bba5c3..6c78546a 100644 --- 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 8967ccd2..65f14e12 100644 --- 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); -- cgit