From 8c095eea8fbe2f8c219bdb2aebcf61e4e3993f53 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 10 Jul 2005 22:54:19 +0000 Subject: 2005-07-10 Colin Walters * doc/TODO: Knock off some GLib items with this patch. * glib/dbus-gvalue-utils.c (_dbus_gtype_can_signal_error) (_dbus_gvalue_signals_error): New functions. * glib/dbus-gvalue-utils.h: Prototype them. * glib/dbus-gobject.c (arg_iterate): Update to handle return vals and change to not output const/retval flags for input args. All callers updated. (invoke_object_method): Refactor to handle return values. Add some more comments in various places. Remove debug g_print. * glib/dbus-binding-tool-glib.h (DBUS_GLIB_ANNOTATION_RETURNVAL): New. * glib/dbus-binding-tool-glib.c (dbus_g_type_get_marshal_name): Handle G_TYPE_NONE. (compute_gsignature): New function; refactored from code from compute_marshaller and compute_marshaller_name. Enhance to handle return values and async ops more cleanly. Update for async ops returning NONE instead of BOOLEAN. (compute_marshaller, compute_marshaller_name): Call compute_gsignature and output appropriate string. (generate_glue): Handle return value annotation. Also don't dump constness flag for input arguments. * glib/Makefile.am (DBUS_GLIB_INTERNALS): New variable; contains files shared between installed library and utilities. (libdbus_glib_1_la_SOURCES): Move some stuf into DBUS_GLIB_INTERNALS. (libdbus_gtool_la_SOURCES): Suck in DBUS_GLIB_INTERNALS so the binding tool can access gtype utility functions. * test/glib/test-service-glib.c: * test/glib/test-service-glib.xml: * test/glib/test-dbus-glib.c: Add some tests for return values. --- glib/Makefile.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'glib/Makefile.am') diff --git a/glib/Makefile.am b/glib/Makefile.am index 26724b93..1abf6805 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -11,6 +11,13 @@ BUILT_SOURCES = dbus-glib-error-switch.h CLEANFILES = $(BUILT_SOURCES) +DBUS_GLIB_INTERNALS = \ + dbus-gtype-specialized.c \ + dbus-gutils.c \ + dbus-gutils.h \ + dbus-gvalue-utils.c \ + dbus-gvalue-utils.h + libdbus_glib_1_la_SOURCES = \ dbus-glib-error-switch.h \ dbus-glib.c \ @@ -23,13 +30,9 @@ libdbus_glib_1_la_SOURCES = \ dbus-gtest.c \ dbus-gtest.h \ dbus-gthread.c \ - dbus-gutils.c \ - dbus-gutils.h \ dbus-gvalue.c \ - dbus-gtype-specialized.c \ dbus-gvalue.h \ - dbus-gvalue-utils.c \ - dbus-gvalue-utils.h + $(DBUS_GLIB_INTERNALS) libdbus_glib_HEADERS = \ dbus-gtype-specialized.h @@ -44,14 +47,12 @@ libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CU # convenience lib used here and by dbus-viewer noinst_LTLIBRARIES=libdbus-gtool.la -libdbus_gtool_la_SOURCES = \ +libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ dbus-gidl.c \ dbus-gidl.h \ dbus-gloader-expat.c \ dbus-gparser.c \ - dbus-gparser.h \ - dbus-gutils.c \ - dbus-gutils.h + dbus-gparser.h libdbus_gtool_la_LIBADD = libdbus-glib-1.la -- cgit